geophystech#352 Исправлен баг с прозрачными кружочками на главной.

aivazoff · May 9, 2019 · a13cbed · a13cbed
1 parent c283f12
commit a13cbed
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss
@@ -219,6 +219,10 @@ details {
 }
 
 .circle-marker-map {
-  border: 1px solid #666;
-  border-radius: 50%;
+  > div {
+    border: 1px solid #222;
+    border-radius: 50%;
+    height: 100%;
+    width: 100%;
+  }
 }
diff --git a/src/map_functions.js b/src/map_functions.js
@@ -636,19 +636,16 @@ export function createMapEventMarker(event, $moment)
   const options = {
     fillColor: eventColor(datetimeDiff),
     radius: eventRadius(magnitude),
-    numberOfSides: 360,
-    colorOpacity: 1.0,
-    fillOpacity: 0.8,
-    gradient: false,
-    color: 'black',
-    weight: 1
+    fillOpacity: 0.75
   }
 
-  const coordinates = new window.L.LatLng(latitude, longitude)
-  const marker = new window.L.CircleMarker(coordinates, options)
-
-  /*options.icon = window.L.divIcon({className: 'circle-marker-map'})
-  const marker = window.L.marker(coordinates, options)*/
+  const marker = window.L.marker(new window.L.LatLng(latitude, longitude), {
+    icon: window.L.divIcon({
+      html: `<div style="background: ${colorHexToRGB(options.fillColor, options.fillOpacity)}"></div>`,
+      iconSize: eventRadius(magnitude) * 2.2,
+      className: 'circle-marker-map'
+    })
+  })
 
   const popup =
     `<table class="table table-hover table-sm table-responsive">