Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Genesys PGR
Genesys Catalog
catalog.genesys-pgr.org
Commits
c288077e
Commit
c288077e
authored
Feb 12, 2018
by
Matija Obreza
Browse files
Merge branch '247-leaflet-map-using-http' into 'master'
Resolve "Leaflet map using HTTP" Closes
#247
See merge request
!186
parents
6d69c75e
adb6db5d
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/ui/pages/dataset/c/LocationMap.tsx
View file @
c288077e
...
...
@@ -97,8 +97,8 @@ class LocationMap extends React.Component<ILocationMapProps, any> {
doubleClickZoom
=
{
false
}
>
<
TileLayer
attribution
=
{
'
© <a href="http://
osm
.org/copyright">OpenStreetMap</a> contributors
'
}
url
=
{
'
http://{s}.tile.o
sm
.org/{z}/{x}/{y}.png
'
}
attribution
=
{
'
© <a href="http://
www.openstreetmap
.org/copyright">OpenStreetMap</a> contributors
'
}
url
=
{
'
http
s
://{s}.tile.o
penstreetmap
.org/{z}/{x}/{y}.png
'
}
/>
{
positions
&&
positions
.
map
((
position
,
i
)
=>
(
<
Marker
key
=
{
i
}
position
=
{
position
}
/>
...
...
src/ui/pages/dataset/dataset-stepper/steps/timing-and-location/FormMap.tsx
View file @
c288077e
...
...
@@ -117,8 +117,8 @@ class FormMap extends React.Component<IFormMapProps, any> {
zoom
=
{
6
}
>
<
TileLayer
attribution
=
{
'
© <a href="http://
osm
.org/copyright">OpenStreetMap</a> contributors
'
}
url
=
{
'
http://{s}.tile.o
sm
.org/{z}/{x}/{y}.png
'
}
attribution
=
{
'
© <a href="http://
www.openstreetmap
.org/copyright">OpenStreetMap</a> contributors
'
}
url
=
{
'
http
s
://{s}.tile.o
penstreetmap
.org/{z}/{x}/{y}.png
'
}
/>
{
position
&&
<
Marker
onContextmenu
=
{
this
.
onMarkerRightClick
}
position
=
{
position
}
/>
}
</
Map
>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment