diff --git a/src/geologic_features.sld b/src/geologic_features.sld index 7ef9ff5bea1d50b9bb7410d94d8dc8bdd7fd2ad2..7b40b439eac0e1513379e4f5891862bc109264c9 100644 --- a/src/geologic_features.sld +++ b/src/geologic_features.sld @@ -1,21 +1,87 @@ - - + + - GeoStyler Demo + Global_Contacts - GeoStyler Demo - GeoStyler Demo + Global_Contacts - Rule 1 - + Certain + + Certain + + + + "ConType" + Certain + + + + + #000000 + 1 + round + butt + + + + + Approximate + + Approximate + + + + "ConType" + Approx + + + + + #000000 + 1 + round + butt + 5 4 + + + + + Internal + + Internal + + + + "ConType" + Internal + + + + + #000000 + 1 + round + butt + + + + + <all other values> + + <all other values> + + + #ff0000 - 5 + 1 + round + round - + - \ No newline at end of file + diff --git a/src/js/AstroMap.js b/src/js/AstroMap.js index 1f30f5aff0de02f1e9071bc70ee5400a0b78a157..46c03e51bc7f265361848523c796b22e869fa4bf 100644 --- a/src/js/AstroMap.js +++ b/src/js/AstroMap.js @@ -307,14 +307,14 @@ export default L.Map.AstroMap = L.Map.extend({ if(featureCollections[i].features.length > 0) { // Set colors if available - let myStyle = i < colors.length ? {fillColor: colors[i], color: lightcolors[i]} : {}; + //let myStyle = i < colors.length ? {fillColor: colors[i], color: lightcolors[i]} : {}; // Wrap features let wrappedFeatures = this.cloneWestEast(featureCollections[i].features); this._geoLayers[i] = L.geoJSON(wrappedFeatures, { id: featureCollections[i].id, - style: myStyle + style: this.SLDStyler.getStyleFunction() }) this._geoLayers[i].on({click: this.handleClick}); // Add click listener