From 75542501573cedb0b7d34a65df5ca650faf82d24 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Wed, 13 Mar 2024 17:43:15 -0700
Subject: Remove Mozilla location service

---
 src/main/java/org/traccar/MainModule.java          |  7 ++----
 src/main/java/org/traccar/config/Keys.java         |  2 +-
 .../geolocation/MozillaGeolocationProvider.java    | 28 ----------------------
 .../geolocation/GeolocationProviderTest.java       |  2 +-
 4 files changed, 4 insertions(+), 35 deletions(-)
 delete mode 100644 src/main/java/org/traccar/geolocation/MozillaGeolocationProvider.java

diff --git a/src/main/java/org/traccar/MainModule.java b/src/main/java/org/traccar/MainModule.java
index 3fec4d1e6..acdf48874 100644
--- a/src/main/java/org/traccar/MainModule.java
+++ b/src/main/java/org/traccar/MainModule.java
@@ -69,7 +69,6 @@ import org.traccar.geocoder.TestGeocoder;
 import org.traccar.geocoder.TomTomGeocoder;
 import org.traccar.geolocation.GeolocationProvider;
 import org.traccar.geolocation.GoogleGeolocationProvider;
-import org.traccar.geolocation.MozillaGeolocationProvider;
 import org.traccar.geolocation.OpenCellIdGeolocationProvider;
 import org.traccar.geolocation.UnwiredGeolocationProvider;
 import org.traccar.handler.GeocoderHandler;
@@ -276,18 +275,16 @@ public class MainModule extends AbstractModule {
     @Provides
     public static GeolocationProvider provideGeolocationProvider(Config config, Client client) {
         if (config.getBoolean(Keys.GEOLOCATION_ENABLE)) {
-            String type = config.getString(Keys.GEOLOCATION_TYPE, "mozilla");
+            String type = config.getString(Keys.GEOLOCATION_TYPE, "google");
             String url = config.getString(Keys.GEOLOCATION_URL);
             String key = config.getString(Keys.GEOLOCATION_KEY);
             switch (type) {
-                case "google":
-                    return new GoogleGeolocationProvider(client, key);
                 case "opencellid":
                     return new OpenCellIdGeolocationProvider(client, url, key);
                 case "unwired":
                     return new UnwiredGeolocationProvider(client, url, key);
                 default:
-                    return new MozillaGeolocationProvider(client, key);
+                    return new GoogleGeolocationProvider(client, key);
             }
         }
         return null;
diff --git a/src/main/java/org/traccar/config/Keys.java b/src/main/java/org/traccar/config/Keys.java
index 02e684875..4aacb2cd8 100644
--- a/src/main/java/org/traccar/config/Keys.java
+++ b/src/main/java/org/traccar/config/Keys.java
@@ -1656,7 +1656,7 @@ public final class Keys {
             List.of(KeyType.CONFIG));
 
     /**
-     * Provider to use for LBS location. Available options: google, mozilla and opencellid. By default opencellid is
+     * Provider to use for LBS location. Available options: google, unwired and opencellid. By default, google is
      * used. You have to supply a key that you get from corresponding provider. For more information see LBS geolocation
      * documentation.
      */
diff --git a/src/main/java/org/traccar/geolocation/MozillaGeolocationProvider.java b/src/main/java/org/traccar/geolocation/MozillaGeolocationProvider.java
deleted file mode 100644
index 7eb22dcca..000000000
--- a/src/main/java/org/traccar/geolocation/MozillaGeolocationProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2015 - 2022 Anton Tananaev (anton@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.geolocation;
-
-import jakarta.ws.rs.client.Client;
-
-public class MozillaGeolocationProvider extends UniversalGeolocationProvider {
-
-    private static final String URL = "https://location.services.mozilla.com/v1/geolocate";
-
-    public MozillaGeolocationProvider(Client client, String key) {
-        super(client, URL, key != null ? key : "test");
-    }
-
-}
diff --git a/src/test/java/org/traccar/geolocation/GeolocationProviderTest.java b/src/test/java/org/traccar/geolocation/GeolocationProviderTest.java
index da5ae3340..c1fa6dbbe 100644
--- a/src/test/java/org/traccar/geolocation/GeolocationProviderTest.java
+++ b/src/test/java/org/traccar/geolocation/GeolocationProviderTest.java
@@ -19,7 +19,7 @@ public class GeolocationProviderTest extends BaseTest {
     @Disabled
     @Test
     public void testMozilla() throws Exception {
-        MozillaGeolocationProvider provider = new MozillaGeolocationProvider(client, null);
+        GoogleGeolocationProvider provider = new GoogleGeolocationProvider(client, null);
 
         Network network = new Network(CellTower.from(208, 1, 2, 1234567));
 
-- 
cgit v1.2.3