From a1157867d5dd21693927ad6335fcf320eee1e3d0 Mon Sep 17 00:00:00 2001
From: Yoan Pintas <yoan@pintas.bzh>
Date: Wed, 10 Apr 2024 01:24:38 +0200
Subject: [PATCH] Use openmaptiles.geo.data.gouv.fr for withoutpinning variant
 (#1024)

---
 changelog.d/1024.misc                         |  1 +
 .../im/vector/app/features/location/Config.kt |  3 +--
 .../app/features/location/TchapConfig.kt      | 20 +++++++++++++++++++
 .../app/features/location/TchapConfig.kt      | 20 +++++++++++++++++++
 4 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/1024.misc
 create mode 100644 vector/src/withoutpinning/java/im/vector/app/features/location/TchapConfig.kt
 create mode 100644 vector/src/withpinning/java/im/vector/app/features/location/TchapConfig.kt

diff --git a/changelog.d/1024.misc b/changelog.d/1024.misc
new file mode 100644
index 0000000000..a5d8a55556
--- /dev/null
+++ b/changelog.d/1024.misc
@@ -0,0 +1 @@
+Mise à jour des styles de cartes pour fdroid.
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/app/features/location/Config.kt b/vector/src/main/java/im/vector/app/features/location/Config.kt
index 5b8f5ca71b..19cca280c1 100644
--- a/vector/src/main/java/im/vector/app/features/location/Config.kt
+++ b/vector/src/main/java/im/vector/app/features/location/Config.kt
@@ -17,8 +17,7 @@
 package im.vector.app.features.location
 
 // Tchap: Tiles from IGN
-const val MAP_BASE_URL = "https://data.geopf.fr/annexes/ressources/vectorTiles/styles/PLAN.IGN/standard.json"
-
+// const val MAP_BASE_URL = "https://data.geopf.fr/annexes/ressources/vectorTiles/styles/PLAN.IGN/standard.json"
 // Tchap: Tiles from geo.data.gouv.fr
 // const val MAP_BASE_URL = "https://openmaptiles.geo.data.gouv.fr/styles/osm-bright/style.json"
 // Tchap: Generate and load map on device
diff --git a/vector/src/withoutpinning/java/im/vector/app/features/location/TchapConfig.kt b/vector/src/withoutpinning/java/im/vector/app/features/location/TchapConfig.kt
new file mode 100644
index 0000000000..bf0fac34a6
--- /dev/null
+++ b/vector/src/withoutpinning/java/im/vector/app/features/location/TchapConfig.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2024 New Vector Ltd
+ *
+ * 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 im.vector.app.features.location
+
+// Tchap: Tiles from geo.data.gouv.fr
+const val MAP_BASE_URL = "https://openmaptiles.geo.data.gouv.fr/styles/osm-bright/style.json"
diff --git a/vector/src/withpinning/java/im/vector/app/features/location/TchapConfig.kt b/vector/src/withpinning/java/im/vector/app/features/location/TchapConfig.kt
new file mode 100644
index 0000000000..6cf410f3a2
--- /dev/null
+++ b/vector/src/withpinning/java/im/vector/app/features/location/TchapConfig.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2024 New Vector Ltd
+ *
+ * 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 im.vector.app.features.location
+
+// Tchap: Tiles from IGN
+const val MAP_BASE_URL = "https://data.geopf.fr/annexes/ressources/vectorTiles/styles/PLAN.IGN/standard.json"