Merge pull request #94 from DavidLevinsky/master

Fixed filters in geodata styles
melowntech · Mar 1, 2018 · 3bba9bb · 3bba9bb
2 parents da8a336 + b4ffbe4
commit 3bba9bb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vts-browser-js",
-  "version": "2.13.4",
+  "version": "2.13.6",
   "description": "JavaScript WebGL 3D maps rendering engine",
   "main": "src/browser/index.js",
   "scripts": {

diff --git a/src/core/core.js b/src/core/core.js
@@ -479,7 +479,7 @@ string getCoreVersion()
 */
 
 function getCoreVersion(full) {
-    return (full ? 'Core: ' : '') + '2.13.4';
+    return (full ? 'Core: ' : '') + '2.13.6';
 }
 
 

diff --git a/src/core/map/geodata-processor/worker-style.js b/src/core/map/geodata-processor/worker-style.js
@@ -29,6 +29,7 @@ var getLayerExpresionValue = function(layer, value, feature, lod, key) {
                 case '#': 
                     //debugger;
                     switch(value) {
+                        case '#id':       finalValue = feature.id; break;   
                         case '#type':     finalValue = globals.featureType; break;   
                         case '#group':    finalValue = globals.groupId;     break;
                         case '#lod':      finalValue = globals.tileLod;  break;
@@ -58,6 +59,7 @@ var getLayerExpresionValue = function(layer, value, feature, lod, key) {
                         case '#': 
                             //debugger;
                             switch(str) {
+                                case '#id':       finalValue = feature.id; break;   
                                 case '#type':     finalValue = globals.featureType; break;   
                                 case '#group':    finalValue = globals.groupId;     break;
                                 case '#lod':      finalValue = globals.tileLod;  break;
@@ -155,6 +157,7 @@ var getLayerPropertyValueInner = function(layer, key, feature, lod, value, depth
                 case '#': 
                     //debugger;
                     switch(value) {
+                        case '#id':       finalValue = feature.id; break;   
                         case '#type':     finalValue = globals.featureType; break;   
                         case '#group':    finalValue = globals.groupId;     break;
                         case '#lod':      finalValue = globals.tileLod;  break;
-Original file line number
+Diff line change
@@ Expand Up / @@ -479,7 +479,7 @@ string getCoreVersion() @@
     */
     function getCoreVersion(full) {
-        return (full ? 'Core: ' : '') + '2.13.4';
+        return (full ? 'Core: ' : '') + '2.13.6';
     }
@@ Expand Down @@