Merge branch 'rc/v1.0.2' into release

ecds · May 17, 2021 · ddc018f · ddc018f
2 parents 25df59a + 597fb31
commit ddc018f
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 5 deletions.
diff --git a/.ember-cli.dst b/.ember-cli.dst
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,17 @@
+# CHANGELOG
+
+## v1.0.2
+
+### Fixed
+
+- Pinpoint markers on Layers route
+
+## v1.0.1
+
+### Added
+
+- Meta tags for routes
+
+## v1.0.0
+
+Initial release
diff --git a/app/controllers/layers.js b/app/controllers/layers.js
@@ -34,4 +34,17 @@ export default class LayersController extends Controller {
  this.activeFeature = feature;
  });
  }
-}
+
+ @action
+ addMarker(vectorFeature, vector, layer, feature/*, point*/) {
+ if (vectorFeature.geometryType.includes('Point')) {
+ vectorFeature.setProperties(
+ {
+ geometry: feature
+ }
+ );
+ vectorFeature.leafletMarker.setIcon(vectorFeature.divIcon);
+ // This function has to return the marker object.
+ return vectorFeature.leafletMarker;
+ }
+ }}
diff --git a/app/templates/layers.hbs b/app/templates/layers.hbs
@@ -39,6 +39,7 @@
  @color={{if (or (eq feature.geometryType 'LineString') (eq feature.geometryType 'MultiLineString')) (vector-color this.layer feature) "darkgray" }}
  @fillColor={{vector-color this.layer feature}}
  @style={{feature.style}}
+ @pointToLayer={{fn this.addMarker feature this.layer}}
  />
  {{/each}}
  {{/if}}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "atlmaps-client",
- "version": "1.0.1",
+ "version": "1.0.2",
  "private": true,
  "description": "Front end app for ATLMaps.org",
  "repository": "",