@wemap/osm 5.8.0 → 6.0.0

package/index.js

@@ -1,28 +1,5 @@
-/* Parser / Model */
-export { default as OsmElement } from './src/model/OsmElement.js';
-export { default as OsmModel } from './src/model/OsmModel.js';
-export { default as OsmNode } from './src/model/OsmNode.js';
-export { default as OsmParser } from './src/model/OsmParser.js';
-export { default as OsmWay } from './src/model/OsmWay.js';
-
-/* Custom Router */
-export { default as OsmRouter } from './src/routers/custom/OsmRouter.js';
-export { default as OsmRouterOptions } from './src/routers/custom/OsmRouterOptions.js';
-export * as OsmRouterUtils from './src/routers/custom/OsmRouterUtils.js';
-export * as OsmNetworkUtils from './src/routers/custom/OsmNetworkUtils.js';
-
-/* Other Routers */
-export * as OsrmUtils from './src/routers/osrm/OsrmUtils.js';
-export * as OtpUtils from './src/routers/otp/OtpUtils.js';
-export * as CitywayUtils from './src/routers/cityway/CitywayUtils.js';
-export * as DeutscheBahnRouterUtils from './src/routers/deutsche-bahn/DeutscheBahnRouterUtils.js';
-
-/* Router model */
-export { default as RouterResponse } from './src/routers/RouterResponse.js';
-export { default as Itinerary } from './src/routers/Itinerary.js';
-export { default as Leg } from './src/routers/Leg.js';
-export { default as Step } from './src/routers/Step.js';
-export { default as LevelChange } from './src/routers/LevelChange.js';
-
-export { default as ItineraryInfo } from './src/routers/info/ItineraryInfo.js';
-export { default as ItineraryInfoManager } from './src/routers/info/ItineraryInfoManager.js';
+export { default as OsmElement } from './src/OsmElement.js';
+export { default as OsmModel } from './src/OsmModel.js';
+export { default as OsmNode } from './src/OsmNode.js';
+export { default as OsmParser } from './src/OsmParser.js';
+export { default as OsmWay } from './src/OsmWay.js';

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/osm"
     },
     "name": "@wemap/osm",
-    "version": "5.8.0",
+    "version": "6.0.0",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -25,11 +25,9 @@
     ],
     "license": "ISC",
     "dependencies": {
-        "@mapbox/polyline": "^1.1.1",
-        "@wemap/geo": "^5.6.0",
-        "@wemap/logger": "^5.0.0",
-        "@wemap/maths": "^5.6.0",
+        "@wemap/geo": "^6.0.0",
+        "@wemap/logger": "^6.0.0",
         "saxes": "^5.0.1"
     },
-    "gitHead": "09cd417cec44833c571406d74836ce476ab2a277"
+    "gitHead": "a377d6fd98b48ce0e083ece1c695642947c456cc"
 }

package/src/{model/OsmParser.spec.js → OsmParser.spec.js}

@@ -15,7 +15,7 @@ describe('OsmParser', () => {
 
     it('parseOsmXmlString', () => {
 
-        const filePath = path.resolve(__dirname, '../../assets/simple.osm');
+        const filePath = path.resolve(__dirname, '../assets/simple.osm');
         const osmXmlString = fs.readFileSync(filePath, 'utf8');
 
         const model = OsmParser.parseOsmXmlString(osmXmlString);

package/assets/bureaux-wemap-montpellier-network.osm

@@ -1,162 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' generator='JOSM'>
-  <node id='-440460' action='modify' visible='true' lat='43.60927603206' lon='3.88424673798'>
-    <tag k='name' v='p7' />
-  </node>
-  <node id='-440462' action='modify' visible='true' lat='43.60913609818' lon='3.88411091795'>
-    <tag k='name' v='p3' />
-  </node>
-  <node id='-440464' action='modify' visible='true' lat='43.60929353543' lon='3.88425183223'>
-    <tag k='name' v='p8' />
-  </node>
-  <node id='-440466' action='modify' visible='true' lat='43.60930219142' lon='3.88427017086'>
-    <tag k='name' v='p9' />
-  </node>
-  <node id='-440468' action='modify' visible='true' lat='43.60911942685' lon='3.88422017773'>
-    <tag k='name' v='p4' />
-  </node>
-  <node id='-440470' action='modify' visible='true' lat='43.60935581261' lon='3.88428577699'>
-    <tag k='name' v='p22' />
-  </node>
-  <node id='-440472' action='modify' visible='true' lat='43.60919651074' lon='3.88412853633'>
-    <tag k='name' v='p1' />
-  </node>
-  <node id='-440474' action='modify' visible='true' lat='43.60931199709' lon='3.88413083832'>
-    <tag k='name' v='p25' />
-  </node>
-  <node id='-440476' action='modify' visible='true' lat='43.60917494597' lon='3.88421731753'>
-    <tag k='name' v='p6' />
-  </node>
-  <node id='-440478' action='modify' visible='true' lat='43.60918883875' lon='3.88412626772'>
-    <tag k='name' v='p2' />
-  </node>
-  <node id='-440480' action='modify' visible='true' lat='43.60936726345' lon='3.88427546746'>
-    <tag k='name' v='p23' />
-  </node>
-  <node id='-440482' action='modify' visible='true' lat='43.60917216742' lon='3.8842355275'>
-    <tag k='name' v='p5' />
-  </node>
-  <node id='-440484' action='modify' visible='true' lat='43.60931231268' lon='3.8842731166'>
-    <tag k='name' v='p10' />
-  </node>
-  <node id='-440486' action='modify' visible='true' lat='43.60932336323' lon='3.884200898'>
-    <tag k='name' v='p11' />
-  </node>
-  <node id='-440488' action='modify' visible='true' lat='43.6093629216' lon='3.884212726'>
-    <tag k='name' v='p12' />
-  </node>
-  <node id='-440490' action='modify' visible='true' lat='43.60935965678' lon='3.8842335535'>
-    <tag k='name' v='p13' />
-  </node>
-  <node id='-440492' action='modify' visible='true' lat='43.60932022256' lon='3.88422176261'>
-    <tag k='name' v='p14' />
-  </node>
-  <node id='-440494' action='modify' visible='true' lat='43.60931232238' lon='3.88427309743'>
-    <tag k='name' v='p15' />
-  </node>
-  <node id='-440496' action='modify' visible='true' lat='43.60936673756' lon='3.88428907078'>
-    <tag k='name' v='p24' />
-  </node>
-  <node id='-440498' action='modify' visible='true' lat='43.60926807571' lon='3.884260391'>
-    <tag k='name' v='p16' />
-  </node>
-  <node id='-441184' action='modify' visible='true' lat='43.60932786117' lon='3.88427765877'>
-    <tag k='name' v='p18' />
-  </node>
-  <node id='-441187' action='modify' visible='true' lat='43.60933232537' lon='3.88424831515'>
-    <tag k='highway' v='elevator' />
-    <tag k='level' v='0;2' />
-    <tag k='name' v='p19' />
-  </node>
-  <node id='-441210' action='modify' visible='true' lat='43.60932786111' lon='3.8842776591'>
-    <tag k='name' v='p17' />
-  </node>
-  <node id='-441262' action='modify' visible='true' lat='43.60932198746' lon='3.8843159771'>
-    <tag k='name' v='p21' />
-  </node>
-  <way id='-440499' action='modify' visible='true'>
-    <nd ref='-440476' />
-    <nd ref='-440460' />
-    <nd ref='-440464' />
-    <nd ref='-440474' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='2' />
-    <tag k='name' v='w2' />
-  </way>
-  <way id='-440500' action='modify' visible='true'>
-    <nd ref='-440464' />
-    <nd ref='-440466' />
-    <nd ref='-440484' />
-    <nd ref='-441184' />
-    <nd ref='-440470' />
-    <nd ref='-440480' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='2' />
-    <tag k='name' v='w3' />
-  </way>
-  <way id='-440501' action='modify' visible='true'>
-    <nd ref='-440472' />
-    <nd ref='-440478' />
-    <nd ref='-440462' />
-    <nd ref='-440468' />
-    <nd ref='-440482' />
-    <nd ref='-440476' />
-    <nd ref='-440478' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='2' />
-    <tag k='name' v='w1' />
-  </way>
-  <way id='-440502' action='modify' visible='true'>
-    <nd ref='-440486' />
-    <nd ref='-440488' />
-    <nd ref='-440490' />
-    <nd ref='-440492' />
-    <tag k='highway' v='steps' />
-    <tag k='level' v='1;2' />
-    <tag k='name' v='w6' />
-  </way>
-  <way id='-440503' action='modify' visible='true'>
-    <nd ref='-440484' />
-    <nd ref='-440486' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='2' />
-    <tag k='name' v='w5' />
-  </way>
-  <way id='-440504' action='modify' visible='true'>
-    <nd ref='-440492' />
-    <nd ref='-440494' />
-    <nd ref='-441210' />
-    <nd ref='-440496' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='1' />
-    <tag k='name' v='w7' />
-  </way>
-  <way id='-440505' action='modify' visible='true'>
-    <nd ref='-440494' />
-    <nd ref='-440498' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='1' />
-    <tag k='name' v='w9' />
-  </way>
-  <way id='-441188' action='modify' visible='true'>
-    <nd ref='-441184' />
-    <nd ref='-441187' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='2' />
-    <tag k='name' v='w4' />
-  </way>
-  <way id='-441214' action='modify' visible='true'>
-    <nd ref='-441210' />
-    <nd ref='-441187' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='1' />
-    <tag k='name' v='w8' />
-  </way>
-  <way id='-441263' action='modify' visible='true'>
-    <nd ref='-441187' />
-    <nd ref='-441262' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='0' />
-    <tag k='name' v='w10' />
-  </way>
-</osm>

package/assets/gare-de-lyon-extract.osm

@@ -1,174 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' generator='JOSM'>
-  <node id='-517853' action='modify' visible='true' lat='48.8446160213' lon='2.37196210021'>
-    <tag k='name' v='p5' />
-  </node>
-  <node id='-517854' action='modify' visible='true' lat='48.84459094139' lon='2.37200629832'>
-    <tag k='name' v='p13' />
-  </node>
-  <node id='-517855' action='modify' visible='true' lat='48.84484076717' lon='2.37172454529'>
-    <tag k='name' v='p14' />
-  </node>
-  <node id='-517856' action='modify' visible='true' lat='48.84482514548' lon='2.37169289522'>
-    <tag k='name' v='p15' />
-  </node>
-  <node id='-517857' action='modify' visible='true' lat='48.84447272937' lon='2.37213961713'>
-    <tag k='name' v='p17' />
-  </node>
-  <node id='-517858' action='modify' visible='true' lat='48.8445706698' lon='2.3719601573'>
-    <tag k='name' v='p12' />
-  </node>
-  <node id='-517859' action='modify' visible='true' lat='48.84420529552' lon='2.37269348149'>
-    <tag k='name' v='p20' />
-  </node>
-  <node id='-517860' action='modify' visible='true' lat='48.84458797362' lon='2.37234072564'>
-    <tag k='name' v='p18' />
-  </node>
-  <node id='-517861' action='modify' visible='true' lat='48.8448156136' lon='2.37167358331'>
-    <tag k='name' v='p16' />
-  </node>
-  <node id='-517862' action='modify' visible='true' lat='48.84417263969' lon='2.37257222525'>
-    <tag k='name' v='p19' />
-  </node>
-  <node id='-517863' action='modify' visible='true' lat='48.84466201501' lon='2.37186006326'>
-    <tag k='name' v='p4' />
-  </node>
-  <node id='-517864' action='modify' visible='true' lat='48.84456231196' lon='2.37194113366'>
-    <tag k='name' v='p11' />
-  </node>
-  <node id='-517865' action='modify' visible='true' lat='48.84445412307' lon='2.37216128192'>
-    <tag k='name' v='p6' />
-  </node>
-  <node id='1395307661' action='modify' timestamp='2019-09-19T15:44:48Z' uid='439947' user='StephaneP' visible='true' version='11' changeset='74681133' lat='48.8444657' lon='2.3720493'>
-    <tag k='access:RATP' v='yes' />
-    <tag k='level' v='-1' />
-    <tag k='name' v='p7' />
-    <tag k='railway' v='subway_entrance' />
-    <tag k='ref' v='13' />
-    <tag k='source' v='cadastre-dgi-fr source : Direction Générale des Impôts - Cadastre. Mise à jour : 2011' />
-    <tag k='wheelchair' v='no' />
-  </node>
-  <node id='1395307662' action='modify' timestamp='2019-09-19T15:44:48Z' uid='439947' user='StephaneP' visible='true' version='3' changeset='74681133' lat='48.8445534' lon='2.3719505'>
-    <tag k='name' v='p10' />
-  </node>
-  <node id='1395307663' action='modify' timestamp='2019-09-19T16:18:40Z' uid='439947' user='StephaneP' visible='true' version='12' changeset='74683089' lat='48.8446992' lon='2.3718257'>
-    <tag k='level' v='-1' />
-    <tag k='name' v='p3' />
-    <tag k='railway' v='subway_entrance' />
-    <tag k='ref' v='13' />
-    <tag k='source' v='cadastre-dgi-fr source : Direction Générale des Impôts - Cadastre. Mise à jour : 2011' />
-    <tag k='wheelchair' v='no' />
-  </node>
-  <node id='1395307664' action='modify' timestamp='2019-09-19T15:44:48Z' uid='439947' user='StephaneP' visible='true' version='3' changeset='74681133' lat='48.8448098' lon='2.3717096'>
-    <tag k='name' v='p2' />
-  </node>
-  <node id='4086374112' action='modify' timestamp='2019-09-19T16:18:40Z' uid='439947' user='StephaneP' visible='true' version='3' changeset='74683089' lat='48.8444961' lon='2.3720441'>
-    <tag k='access:RATP' v='yes' />
-    <tag k='level' v='-1' />
-    <tag k='name' v='p8' />
-    <tag k='railway' v='subway_entrance' />
-    <tag k='ref' v='13' />
-    <tag k='source' v='cadastre-dgi-fr source : Direction Générale des Impôts - Cadastre. Mise à jour : 2011' />
-    <tag k='wheelchair' v='no' />
-  </node>
-  <node id='4086374115' action='modify' timestamp='2019-09-19T15:44:48Z' uid='439947' user='StephaneP' visible='true' version='2' changeset='74681133' lat='48.844562' lon='2.3719702'>
-    <tag k='name' v='p9' />
-  </node>
-  <node id='4086374120' action='modify' timestamp='2019-09-19T16:18:40Z' uid='439947' user='StephaneP' visible='true' version='3' changeset='74683089' lat='48.8446803' lon='2.3718155'>
-    <tag k='level' v='-1' />
-    <tag k='name' v='p1' />
-    <tag k='railway' v='subway_entrance' />
-    <tag k='ref' v='13' />
-    <tag k='source' v='cadastre-dgi-fr source : Direction Générale des Impôts - Cadastre. Mise à jour : 2011' />
-    <tag k='wheelchair' v='no' />
-  </node>
-  <node id='4086374122' action='modify' timestamp='2019-09-19T15:44:48Z' uid='439947' user='StephaneP' visible='true' version='2' changeset='74681133' lat='48.8448048' lon='2.3716859'>
-    <tag k='name' v='p0' />
-  </node>
-  <way id='-517866' action='modify' visible='true'>
-    <nd ref='-517856' />
-    <nd ref='1395307664' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='0' />
-  </way>
-  <way id='-517867' action='modify' visible='true'>
-    <nd ref='-517863' />
-    <nd ref='1395307663' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='-1' />
-  </way>
-  <way id='-517868' action='modify' visible='true'>
-    <nd ref='4086374122' />
-    <nd ref='-517861' />
-    <nd ref='-517856' />
-    <nd ref='-517855' />
-    <nd ref='-517854' />
-    <nd ref='-517857' />
-    <nd ref='-517860' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='0' />
-  </way>
-  <way id='-517869' action='modify' visible='true'>
-    <nd ref='4086374120' />
-    <nd ref='-517863' />
-    <nd ref='-517853' />
-    <nd ref='-517865' />
-    <nd ref='4086374112' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='-1' />
-  </way>
-  <way id='-517870' action='modify' visible='true'>
-    <nd ref='1395307661' />
-    <nd ref='-517865' />
-    <nd ref='-517862' />
-    <nd ref='-517859' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='-1' />
-  </way>
-  <way id='-517871' action='modify' visible='true'>
-    <nd ref='-517858' />
-    <nd ref='4086374115' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='0' />
-  </way>
-  <way id='-517872' action='modify' visible='true'>
-    <nd ref='1395307662' />
-    <nd ref='-517864' />
-    <nd ref='-517858' />
-    <nd ref='-517854' />
-    <tag k='highway' v='footway' />
-    <tag k='level' v='0' />
-  </way>
-  <way id='125679471' action='modify' timestamp='2016-04-15T07:37:33Z' uid='1908665' user='naomap' visible='true' version='4' changeset='38579747'>
-    <nd ref='1395307661' />
-    <nd ref='1395307662' />
-    <tag k='conveying' v='yes' />
-    <tag k='highway' v='steps' />
-    <tag k='incline' v='up' />
-    <tag k='level' v='-1;0' />
-    <tag k='source' v='cadastre-dgi-fr source : Direction Générale des Impôts - Cadastre. Mise à jour : 2011' />
-  </way>
-  <way id='125679474' action='modify' timestamp='2019-09-19T15:44:48Z' uid='439947' user='StephaneP' visible='true' version='6' changeset='74681133'>
-    <nd ref='1395307663' />
-    <nd ref='1395307664' />
-    <tag k='highway' v='steps' />
-    <tag k='incline' v='up' />
-    <tag k='level' v='-1;0' />
-    <tag k='source' v='cadastre-dgi-fr source : Direction Générale des Impôts - Cadastre. Mise à jour : 2011' />
-  </way>
-  <way id='406582305' action='modify' timestamp='2016-04-15T07:37:40Z' uid='1908665' user='naomap' visible='true' version='2' changeset='38579747'>
-    <nd ref='4086374112' />
-    <nd ref='4086374115' />
-    <tag k='highway' v='steps' />
-    <tag k='incline' v='up' />
-    <tag k='level' v='-1;0' />
-  </way>
-  <way id='406582306' action='modify' timestamp='2019-09-19T15:44:48Z' uid='439947' user='StephaneP' visible='true' version='3' changeset='74681133'>
-    <nd ref='4086374120' />
-    <nd ref='4086374122' />
-    <tag k='conveying' v='forward' />
-    <tag k='highway' v='steps' />
-    <tag k='incline' v='up' />
-    <tag k='level' v='-1;0' />
-  </way>
-</osm>