Merge branch 'hotfix/build_4.0.2'

route360 · Jul 18, 2017 · 3584795 · 3584795
2 parents df06f97 + fd1a6f8
commit 3584795
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 16 deletions.
diff --git a/dist/r360-src.js b/dist/r360-src.js
@@ -1,10 +1,10 @@
 /*
- Route360° JavaScript API v0.4.0 (3042efc), a JS library for leaflet maps. http://route360.net
- (c) 2014 Henning Hollburg, Daniel Gerber and Jan Silbersiepe, (c) 2014 Motion Intelligence GmbH
+ Route360° JavaScript API v0.4.2 (e94217c), a JS library for leaflet maps. http://route360.net
+ (c) 2017 Henning Hollburg, Daniel Gerber and Jan Silbersiepe, (c) 2017 Motion Intelligence GmbH
 */
 (function (window, document, undefined) {
 var r360 = {
-	version : 'v0.4.0',
+	version : 'v0.4.2',
 
   // Is a given variable undefined?
   isUndefined : function(obj) {
@@ -1723,11 +1723,12 @@ r360.TravelOptions = function(){
     this.pathSerializer     = 'compact';
     this.polygonSerializer  = 'json';
     this.pointReduction     = true;
-    this.maxRoutingTime     = undefined;
-    this.maxRoutingLength   = undefined;
+    this.maxRoutingTime     = undefined;     // Deprecated
+    this.maxRoutingLength   = undefined;     // Deprecated
+    this.maxEdgeWeight		= undefined;
+    this.edgeWeight			= 'time';
     this.serviceUrl         = undefined;
     this.serviceKey         = undefined;
-    this.edgeWeight			= 'time';
 
     this.getReverse = function(){ return this.reverse; }
     this.setReverse = function(reverse){ this.reverse = reverse; }
@@ -1924,6 +1925,7 @@ r360.TravelOptions = function(){
      */
     this.getMaxRoutingTime = function(){
 
+        console.warn("getMaxRoutingTime is deprecated. use getMaxEdgeWeight instead")
         return this.maxRoutingTime;
     }
 
@@ -1933,10 +1935,14 @@ r360.TravelOptions = function(){
      *
      */
     this.getMaxRoutingLength = function(){
-
+        console.warn("getMaxRoutingLength is deprecated. use getMaxEdgeWeight instead")
         return this.maxRoutingLength;
     }
 
+    this.getMaxEdgeWeight = function(){
+        return this.maxEdgeWeight;
+    }
+
     /*
      *
      *
@@ -2024,6 +2030,7 @@ r360.TravelOptions = function(){
      */
     this.setMaxRoutingTime = function(maxRoutingTime){
 
+        console.warn("setMaxRoutingTime is deprecated. use setMaxEdgeWeight instead")
         this.maxRoutingTime = maxRoutingTime;
     }
 
@@ -2033,10 +2040,15 @@ r360.TravelOptions = function(){
      *
      */
     this.setMaxRoutingLength = function(maxRoutingLength){
-
+        console.warn("setMaxRoutingLength is deprecated. use setMaxEdgeWeight instead")
         this.maxRoutingLength = maxRoutingLength;
     }
 
+
+    this.setMaxEdgeWeight = function(maxEdgeWeight){
+        this.maxEdgeWeight = maxEdgeWeight;
+    }
+
     /*
      *
      *

diff --git a/dist/r360.js b/dist/r360.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "route360",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "The Route360° JavaScript API for Motion Intelligence's time-based access mapping service.",
   "main": "dist/r360.js",
   "directories": {

diff --git a/src/copyright.js b/src/copyright.js
@@ -1,4 +1,4 @@
 /*
  Route360° JavaScript API {VERSION}, a JS library for leaflet maps. http://route360.net
- (c) 2014 Henning Hollburg, Daniel Gerber and Jan Silbersiepe, (c) 2014 Motion Intelligence GmbH
+ (c) 2017 Henning Hollburg, Daniel Gerber and Jan Silbersiepe, (c) 2017 Motion Intelligence GmbH
 */
diff --git a/src/r360.js b/src/r360.js
@@ -1,6 +1,6 @@
 
 var r360 = {
-	version : 'v0.4.0',
+	version : 'v0.4.2',
 
   // Is a given variable undefined?
   isUndefined : function(obj) {