Skip to content

Commit df5f4e9

Browse files
committed
Parametrize LeafLet version and bump version to v1.3.4.
1 parent 14a4d1b commit df5f4e9

File tree

2 files changed

+8
-16
lines changed

2 files changed

+8
-16
lines changed

src/main/java/net/bootsfaces/component/openStreetMap/OpenStreetMap.java

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ public class OpenStreetMap extends OpenStreetMapCore implements ClientBehaviorHo
4848
public static final String COMPONENT_FAMILY = C.BSFCOMPONENT;
4949

5050
public static final String DEFAULT_RENDERER = "net.bootsfaces.component.openStreetMap.OpenStreetMap";
51+
52+
public static final String LEAFLET_VERSION = "1.3.4";
5153

5254
// private static final Collection<String> EVENT_NAMES = Collections.unmodifiableCollection(Arrays.asList("click",
5355
// "dblclick", "dragstart", "dragover", "drop", "mousedown", "mousemove", "mouseout", "mouseover", "mouseup"));
@@ -56,24 +58,14 @@ public OpenStreetMap() {
5658
setRendererType(DEFAULT_RENDERER);
5759
Tooltip.addResourceFiles();
5860
// AddResourcesListener.addThemedCSSResource("core.css");
59-
// AddResourcesListener
60-
// .addResourceIfNecessary("https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.3.1/images/layers-2x.png");
61-
// AddResourcesListener
62-
// .addResourceIfNecessary("https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.3.1/images/layers.png");
63-
// AddResourcesListener.addResourceIfNecessary(
64-
// "https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.3.1/images/marker-icon-2x.png");
65-
// AddResourcesListener
66-
// .addResourceIfNecessary("https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.3.1/images/marker-icon.png");
67-
// AddResourcesListener.addResourceIfNecessary(
68-
// "https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.3.1/images/marker-shadow.png");
6961
AddResourcesListener
70-
.addResourceIfNecessary("https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.3.1/leaflet-src.js");
62+
.addResourceIfNecessary("https://cdnjs.cloudflare.com/ajax/libs/leaflet/"+LEAFLET_VERSION+"/leaflet-src.js");
7163
AddResourcesListener
72-
.addResourceIfNecessary("https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.3.1/leaflet-src.js.map");
73-
AddResourcesListener.addResourceIfNecessary("https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.3.1/leaflet.css");
74-
AddResourcesListener.addResourceIfNecessary("https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.3.1/leaflet.js");
64+
.addResourceIfNecessary("https://cdnjs.cloudflare.com/ajax/libs/leaflet/"+LEAFLET_VERSION+"/leaflet-src.js.map");
65+
AddResourcesListener.addResourceIfNecessary("https://cdnjs.cloudflare.com/ajax/libs/leaflet/"+LEAFLET_VERSION+"/leaflet.css");
66+
AddResourcesListener.addResourceIfNecessary("https://cdnjs.cloudflare.com/ajax/libs/leaflet/"+LEAFLET_VERSION+"/leaflet.js");
7567
AddResourcesListener
76-
.addResourceIfNecessary("https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.3.1/leaflet.js.map");
68+
.addResourceIfNecessary("https://cdnjs.cloudflare.com/ajax/libs/leaflet/"+LEAFLET_VERSION+"/leaflet.js.map");
7769
}
7870

7971
public void setValueExpression(String name, ValueExpression binding) {

src/main/java/net/bootsfaces/component/openStreetMap/OpenStreetMapRenderer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public void encodeEnd(FacesContext context, UIComponent component) throws IOExce
108108
rw.writeText("if('" + openStreetMap.getMarker() + "')", null);
109109
rw.writeText("{", null);
110110
rw.writeText("var " + clientId + "_marker = L.marker([" + openStreetMap.getMarker()
111-
+ "],{icon: new L.Icon({iconSize: [25, 41], iconAnchor: [25, 41], popupAnchor: [-12, -45], iconUrl: 'https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.3.1/images/marker-icon.png', shadowUrl: 'https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.3.1/images/marker-shadow.png'})}).addTo("
111+
+ "],{icon: new L.Icon({iconSize: [25, 41], iconAnchor: [25, 41], popupAnchor: [-12, -45], iconUrl: 'https://cdnjs.cloudflare.com/ajax/libs/leaflet/"+openStreetMap.LEAFLET_VERSION+"/images/marker-icon.png', shadowUrl: 'https://cdnjs.cloudflare.com/ajax/libs/leaflet/"+openStreetMap.LEAFLET_VERSION+"/images/marker-shadow.png'})}).addTo("
112112
+ clientId + "_map);", null);
113113
rw.writeText("if('" + openStreetMap.getPopupMsg() + "')", null);
114114
rw.writeText(clientId + "_marker.bindPopup('" + openStreetMap.getPopupMsg() + "');", null);

0 commit comments

Comments
 (0)