Showing
2 changed files
with
10 additions
and
10 deletions
... | ... | @@ -20,12 +20,12 @@ import 'leaflet-providers'; |
20 | 20 | import 'leaflet.markercluster/dist/leaflet.markercluster'; |
21 | 21 | |
22 | 22 | import { |
23 | - FormattedData, | |
24 | - MapSettings, | |
25 | - MarkerSettings, | |
26 | - PolygonSettings, | |
27 | - PolylineSettings, | |
28 | - UnitedMapSettings | |
23 | + FormattedData, | |
24 | + MapSettings, | |
25 | + MarkerSettings, | |
26 | + PolygonSettings, | |
27 | + PolylineSettings, | |
28 | + UnitedMapSettings | |
29 | 29 | } from './map-models'; |
30 | 30 | import { Marker } from './markers'; |
31 | 31 | import { BehaviorSubject, Observable } from 'rxjs'; |
... | ... | @@ -405,8 +405,8 @@ export default abstract class LeafletMap { |
405 | 405 | |
406 | 406 | updatePolygon(polyData: FormattedData, dataSources: FormattedData[], settings: PolygonSettings) { |
407 | 407 | this.ready$.subscribe(() => { |
408 | - const poly = this.polygons.get(polyData.datasource.entityName); | |
409 | - poly.updatePolygon(polyData.data, dataSources, settings); | |
408 | + const poly = this.polygons.get(polyData.$datasource.entityName); | |
409 | + poly.updatePolygon(polyData, dataSources, settings); | |
410 | 410 | }); |
411 | 411 | } |
412 | 412 | } | ... | ... |
... | ... | @@ -14,7 +14,7 @@ |
14 | 14 | /// limitations under the License. |
15 | 15 | /// |
16 | 16 | |
17 | -import L, { LatLngExpression, LatLngTuple, LeafletMouseEvent } from 'leaflet'; | |
17 | +import L, { LatLngExpression, LeafletMouseEvent } from 'leaflet'; | |
18 | 18 | import { createTooltip, parseWithTranslation, safeExecute } from './maps-utils'; |
19 | 19 | import { FormattedData, PolygonSettings } from './map-models'; |
20 | 20 | |
... | ... | @@ -61,7 +61,7 @@ export class Polygon { |
61 | 61 | this.tooltip.setContent(parseWithTranslation.parseTemplate(pattern, data, true)); |
62 | 62 | } |
63 | 63 | |
64 | - updatePolygon(data: LatLngTuple[], dataSources: FormattedData[], settings: PolygonSettings) { | |
64 | + updatePolygon(data: FormattedData, dataSources: FormattedData[], settings: PolygonSettings) { | |
65 | 65 | this.data = data; |
66 | 66 | this.dataSources = dataSources; |
67 | 67 | this.leafletPoly.setLatLngs(data[this.settings.polygonKeyName]); | ... | ... |