Skip to content

Commit d29c513

Browse files
axeluhlaxeluhl
committed
maplibre-runtime-loader: renamed GoogleMapsLoader to MapsLoader
1 parent 57b0578 commit d29c513

6 files changed

Lines changed: 19 additions & 19 deletions

File tree

‎java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
import com.sap.sailing.gwt.ui.shared.racemap.CanvasOverlayV3;
147147
import com.sap.sailing.gwt.ui.shared.racemap.DetailTypeMetricOverlay;
148148
import com.sap.sailing.gwt.ui.shared.racemap.GoogleMapStyleHelper;
149-
import com.sap.sailing.gwt.ui.shared.racemap.GoogleMapsLoader;
149+
import com.sap.sailing.gwt.ui.shared.racemap.MapsLoader;
150150
import com.sap.sailing.gwt.ui.shared.racemap.RaceSimulationOverlay;
151151
import com.sap.sailing.gwt.ui.shared.racemap.WindStreamletsRaceboardOverlay;
152152
import com.sap.sse.common.Bearing;
@@ -1076,7 +1076,7 @@ public void onFailure(Throwable caught) {
10761076

10771077
@Override
10781078
public void onSuccess(String googleMapsLoaderAuthenticationParams) {
1079-
GoogleMapsLoader.load(onLoad, googleMapsLoaderAuthenticationParams);
1079+
MapsLoader.load(onLoad, googleMapsLoaderAuthenticationParams);
10801080
}
10811081
});
10821082
}
@@ -3312,7 +3312,7 @@ public void updateSettings(RaceMapSettings newSettings) {
33123312
if (newSettings.isShowSatelliteLayer() != settings.isShowSatelliteLayer()) {
33133313
requiresUpdateCoordinateSystem = true;
33143314
}
3315-
if (GoogleMapsLoader.isMapLibreRequested() && newSettings.isShowSeaMarks() != settings.isShowSeaMarks()) {
3315+
if (MapsLoader.isMapLibreRequested() && newSettings.isShowSeaMarks() != settings.isShowSeaMarks()) {
33163316
MapOptions mapOptions = MapOptions.newInstance(/* withdefaults */ false);
33173317
mapOptions.setSeaMarksVisible(newSettings.isShowSeaMarks());
33183318
map.setOptions(mapOptions);
@@ -3780,14 +3780,14 @@ private MapOptions getMapOptions(boolean windUp, boolean showSatelliteLayer, boo
37803780
// no need to try to position the scale control; it always ends up at the right bottom corner
37813781
mapOptions.setStreetViewControl(false);
37823782
mapOptions.setIsFractionalZoomEnabled(true);
3783-
if (GoogleMapsLoader.isMapLibreRequested()) {
3783+
if (MapsLoader.isMapLibreRequested()) {
37843784
mapOptions.setSeaMarksVisible(showSeaMarks);
37853785
}
37863786
return mapOptions;
37873787
}
37883788

37893789
private String getMapTypeId(boolean windUp, boolean showSatelliteLayer) {
3790-
return showSatelliteLayer && (!windUp || GoogleMapsLoader.isMapLibreRequested())
3790+
return showSatelliteLayer && (!windUp || MapsLoader.isMapLibreRequested())
37913791
? MapTypeId.SATELLITE.toString() : SAILING_ANALYTICS_MAP_TYPE_ID;
37923792
}
37933793

‎java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapSettingsDialogComponent.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import com.sap.sailing.gwt.ui.client.StringMessages;
2424
import com.sap.sailing.gwt.ui.client.shared.racemap.RaceMapHelpLinesSettings.HelpLineTypes;
2525
import com.sap.sailing.gwt.ui.client.shared.racemap.RaceMapZoomSettings.ZoomTypes;
26-
import com.sap.sailing.gwt.ui.shared.racemap.GoogleMapsLoader;
26+
import com.sap.sailing.gwt.ui.shared.racemap.MapsLoader;
2727
import com.sap.sse.common.Distance;
2828
import com.sap.sse.common.Util;
2929
import com.sap.sse.common.impl.MeterDistance;
@@ -84,9 +84,9 @@ public Widget getAdditionalWidget(DataEntryDialog<?> dialog) {
8484
showSatelliteLayerCheckbox.setValue(initialSettings.isShowSatelliteLayer());
8585
showSatelliteLayerCheckbox.getElement().setAttribute("selenium_checkbox", String.valueOf(initialSettings.isShowSatelliteLayer()));
8686
showSatelliteLayerCheckbox.ensureDebugId("showSatelliteLayerCheckBox");
87-
showSatelliteLayerCheckbox.setEnabled(GoogleMapsLoader.isMapLibreRequested() || !initialSettings.isWindUp());
87+
showSatelliteLayerCheckbox.setEnabled(MapsLoader.isMapLibreRequested() || !initialSettings.isWindUp());
8888
vp.add(showSatelliteLayerCheckbox);
89-
if (GoogleMapsLoader.isMapLibreRequested()) {
89+
if (MapsLoader.isMapLibreRequested()) {
9090
showSeaMarksCheckbox = dialog.createCheckbox(stringMessages.showSeaMarks());
9191
showSeaMarksCheckbox.setValue(initialSettings.isShowSeaMarks());
9292
showSeaMarksCheckbox.ensureDebugId("showSeaMarksCheckBox");

‎java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/TrueNorthIndicatorPanel.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.google.gwt.event.dom.client.ClickHandler;
66
import com.google.gwt.user.client.ui.FlowPanel;
77
import com.sap.sailing.gwt.ui.client.StringMessages;
8-
import com.sap.sailing.gwt.ui.shared.racemap.GoogleMapsLoader;
8+
import com.sap.sailing.gwt.ui.shared.racemap.MapsLoader;
99
import com.sap.sse.gwt.client.shared.settings.DummyOnSettingsStoredCallback;
1010
import com.sap.sse.security.shared.dto.SecuredDTO;
1111
import com.sap.sse.security.ui.client.premium.PaywallResolver;
@@ -61,7 +61,7 @@ public void toggle() {
6161
final RaceMapSettings newRaceMapSettings = new RaceMapSettings.RaceMapSettingsBuilder(oldRaceMapSettings, securedDTO, paywallResolver)
6262
.withWindUp(newWindUpSettings)
6363
.withShowSatelliteLayer(oldRaceMapSettings.isShowSatelliteLayer() &&
64-
(!newWindUpSettings || GoogleMapsLoader.isMapLibreRequested()))
64+
(!newWindUpSettings || MapsLoader.isMapLibreRequested()))
6565
.build();
6666
if (map.getComponentContext() != null && map.getComponentContext().isStorageSupported(map)) {
6767
map.getComponentContext().storeSettingsForContext(map, newRaceMapSettings,

‎java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/Activator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.osgi.framework.BundleActivator;
66
import org.osgi.framework.BundleContext;
77

8-
import com.sap.sailing.gwt.ui.shared.racemap.GoogleMapsLoader;
8+
import com.sap.sailing.gwt.ui.shared.racemap.MapsLoader;
99

1010
public class Activator implements BundleActivator {
1111
private static BundleContext context;
@@ -37,7 +37,7 @@ public class Activator implements BundleActivator {
3737
private final static String YOUTUBE_V3_API_KEY_ENV_VAR_NAME = "YOUTUBE_V3_API_KEY";
3838

3939
/**
40-
* Required by {@link GoogleMapsLoader#load(Runnable, String)} and to be provided through a system property named
40+
* Required by {@link MapsLoader#load(Runnable, String)} and to be provided through a system property named
4141
* after {@link GOOGLE_MAPS_LOADER_AUTHENTICATION_PARAMS_PROPERTY_NAME}. The value would be something like
4242
* {@code client=abcde&channel=fghij}.
4343
*/

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/GoogleMapsLoader.java renamed to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/MapsLoader.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* will trigger all callbacks registered through the {@link #load(Runnable, String)} method until the maps API
2020
* invokes the callback registered.
2121
*/
22-
public class GoogleMapsLoader {
22+
public class MapsLoader {
2323
/**
2424
* Note: If you use 3, it will take the newest stable available. We want that, although we didn't test with that yet!
2525
* Google Release notes: https://developers.google.com/maps/documentation/javascript/releases.
@@ -57,7 +57,7 @@ public class GoogleMapsLoader {
5757
private static boolean loaded = false;
5858
private static final Set<Runnable> callbacks = new HashSet<>();
5959

60-
private GoogleMapsLoader() {
60+
private MapsLoader() {
6161
}
6262

6363
/**
@@ -165,8 +165,8 @@ private static void installMapsCompatModule(final ScriptElement scriptElement) {
165165
* compatibility ES module callback, which reach {@link #callback()} through this same global.
166166
*/
167167
private static native void installGlobalCallback() /*-{
168-
$wnd[@com.sap.sailing.gwt.ui.shared.racemap.GoogleMapsLoader::MAP_LOADED_CALLBACK_GLOBAL] = $entry(function() {
169-
@com.sap.sailing.gwt.ui.shared.racemap.GoogleMapsLoader::callback()();
168+
$wnd[@com.sap.sailing.gwt.ui.shared.racemap.MapsLoader::MAP_LOADED_CALLBACK_GLOBAL] = $entry(function() {
169+
@com.sap.sailing.gwt.ui.shared.racemap.MapsLoader::callback()();
170170
});
171171
}-*/;
172172

@@ -183,6 +183,6 @@ private static void callback() {
183183
* {@link #installGlobalCallback()}.
184184
*/
185185
private static native void clearGlobalCallback() /*-{
186-
$wnd[@com.sap.sailing.gwt.ui.shared.racemap.GoogleMapsLoader::MAP_LOADED_CALLBACK_GLOBAL] = null;
186+
$wnd[@com.sap.sailing.gwt.ui.shared.racemap.MapsLoader::MAP_LOADED_CALLBACK_GLOBAL] = null;
187187
}-*/;
188188
}

‎java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMap.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import com.sap.sailing.gwt.ui.shared.WindFieldDTO;
4646
import com.sap.sailing.gwt.ui.shared.WindFieldGenParamsDTO;
4747
import com.sap.sailing.gwt.ui.shared.racemap.GoogleMapStyleHelper;
48-
import com.sap.sailing.gwt.ui.shared.racemap.GoogleMapsLoader;
48+
import com.sap.sailing.gwt.ui.shared.racemap.MapsLoader;
4949
import com.sap.sailing.gwt.ui.shared.racemap.PathNameFormatter;
5050
import com.sap.sailing.gwt.ui.simulator.util.ColorPalette;
5151
import com.sap.sailing.gwt.ui.simulator.util.ColorPaletteGenerator;
@@ -445,7 +445,7 @@ public void onFailure(Throwable caught) {
445445

446446
@Override
447447
public void onSuccess(String googleMapsLoaderAuthenticationParams) {
448-
GoogleMapsLoader.load(onLoad, googleMapsLoaderAuthenticationParams);
448+
MapsLoader.load(onLoad, googleMapsLoaderAuthenticationParams);
449449
}
450450
});
451451
}

0 commit comments

Comments
 (0)