Merge pull request #370 from fossgis-routing-server/update-geocoder

update geocoder

package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "test": "eslint src/*.js i18n/*.js",
     "replace": "node ./scripts/replace.js",
-    "compile": "browserify -d src/index.js -s osrm > bundle.raw.js && uglifyjs bundle.raw.js -c -m --source-map=bundle.js.map -o bundle.js",
+    "compile": "browserify -d src/index.js -s osrm > bundle.raw.js && uglifyjs bundle.raw.js -c -m --source-map filename=bundle.js.map -o bundle.js",
     "build": "npm run replace && npm run compile && cp node_modules/leaflet/dist/leaflet.css css/leaflet.css",
     "start-index": "budo src/index.js --serve=bundle.js --live -d | bistre",
     "start": "npm run build && npm run start-index",
@@ -27,20 +27,20 @@
   "license": "ISC",
   "devDependencies": {
     "bistre": "^1.0.1",
-    "browserify": "^14.3.0",
-    "budo": "^9.4.0",
-    "uglify-js": "^2.8.0"
+    "browserify": "^17.0.0",
+    "budo": "^11.8.4",
+    "uglify-js": "^3.17.4"
   },
   "dependencies": {
-    "file-saver": "^1.3.8",
+    "file-saver": "^2.0.5",
     "jsonp": "^0.2.0",
     "jxon": "^2.0.0-beta.5",
-    "leaflet": "~0.7.7",
-    "leaflet-control-geocoder": "~1.2.1",
-    "leaflet-routing-machine": "~3.1.0",
-    "leaflet.locatecontrol": "~0.44.0",
-    "local-storage": "^1.4.2",
-    "osrm-text-instructions": "~0.13.0",
-    "qs": "^6.1.0"
+    "leaflet": "~1.9.4",
+    "leaflet-control-geocoder": "~2.4.0",
+    "leaflet-routing-machine": "3.2.12",
+    "leaflet.locatecontrol": "~0.79.0",
+    "local-storage": "^2.0.0",
+    "osrm-text-instructions": "~0.11.0",
+    "qs": "^6.4.1"
   }
 }

src/index.js

@@ -18,7 +18,7 @@ var mergedOptions = L.extend(leafletOptions.defaultState, parsedOptions);
 var local = localization.get(mergedOptions.language);
 
 // load only after language was chosen
-var itineraryBuilder = require('./itinerary_builder')(mergedOptions.language);
+var ItineraryBuilder = require('./itinerary_builder')(mergedOptions.language);
 
 var mapLayer = leafletOptions.layer;
 var overlay = leafletOptions.overlay;
@@ -92,9 +92,8 @@ function makeIcon(i, n) {
     });
   }
 }
-
 var plan = new ReversablePlan([], {
-  geocoder: Geocoder.nominatim(),
+  geocoder: L.Control.Geocoder.nominatim(),
   routeWhileDragging: true,
   createMarker: function(i, wp, n) {
     var options = {
@@ -129,8 +128,6 @@ var plan = new ReversablePlan([], {
   }
 });
 
-L.extend(L.Routing, itineraryBuilder);
-
 // add marker labels
 var controlOptions = {
   plan: plan,
@@ -147,7 +144,8 @@ var controlOptions = {
   serviceUrl: leafletOptions.services[0].path,
   useZoomParameter: options.lrm.useZoomParameter,
   routeDragInterval: options.lrm.routeDragInterval,
-  collapsible: options.lrm.collapsible
+  collapsible: options.lrm.collapsible,
+  itineraryBuilder: new ItineraryBuilder(),
 };
 var router = (new L.Routing.OSRMv1(controlOptions));
 router._convertRouteOriginal = router._convertRoute;

src/itinerary_builder.js

@@ -82,9 +82,7 @@ module.exports = function (language) {
     });
   }
 
-  L.Routing = L.Routing || {};
-
-  L.Routing.ItineraryBuilder = L.Class.extend({
+  return L.Class.extend({
     options: {
       containerClassName: ''
     },
@@ -145,6 +143,4 @@ module.exports = function (language) {
       return row;
     }
   });
-
-  return L.Routing;
-}
+};