Merge pull request #46 from DemocraciaEnRed/update-mapbox

v2.2 - Update mapbox to major version
DemocraciaEnRed · Jan 31, 2023 · 1cea470 · 1cea470
2 parents 8495070 + 71c035f
commit 1cea470
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -6,6 +6,14 @@ Plataforma digital para gobiernos e instituciones que permite la publicación de
 
 ## Changelog
 
+### v2.2 (2023-02-01)
+
+* No migrations in this version
+* Major update in mapbox GL JS from 1.11.1 to 2.4.1, with this update we are able to use the new mapbox styles and the new mapbox studio.
+* Updated mapbox-gl-draw plugin from 1.0.9 to 1.4.0.
+* NOTE: You should use the Style URL mapbox://styles/mapbox/light-v11 instead of the old style url mapbox://styles/mapbox/light-v10
+* Fixed some maps not getting the Mapbox API Key
+
 ### v2.1 (2023-02-01)
 
 * There is a new migration with this version, make sure to run it. You can do this by running `php artisan migrate` in the root directory of the project. In production you should run `php artisan migrate --force` to avoid any errors.

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
         "vue-template-compiler": "^2.7.14"
     },
     "dependencies": {
-        "@mapbox/mapbox-gl-draw": "^1.3.0",
+        "@mapbox/mapbox-gl-draw": "^1.4.0",
         "@turf/center": "^6.5.0",
         "@turf/center-of-mass": "^6.5.0",
         "animate.css": "^4.1.1",

diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -3,5 +3,5 @@
     "/js/vendor.js": "/js/vendor.js?id=426aefc1d985b646e8d6",
     "/js/admin-app.js": "/js/admin-app.js?id=341991e6d82894a08c58",
     "/js/app.js": "/js/app.js?id=44af238c496abbddf074",
-    "/css/app.css": "/css/app.css?id=5ea131fc2d3a3f47f8c5"
+    "/css/app.css": "/css/app.css?id=c15507f13ab1b4ff7cf6"
 }
diff --git a/resources/sass/_global.scss b/resources/sass/_global.scss
@@ -229,7 +229,7 @@ h5,h6{
 }
 
 #app{
-  background-color: #f2f2f2;
+  background-color: #f5f5f5;
   padding-bottom: 75px;
 }
 

diff --git a/resources/views/admin/settings/edit.blade.php b/resources/views/admin/settings/edit.blade.php
@@ -1,11 +1,11 @@
 @extends('admin.master')
 
 @section('stylesheets')
-<link href='https://api.mapbox.com/mapbox-gl-js/v1.11.1/mapbox-gl.css' rel='stylesheet' />
+<link href='https://api.mapbox.com/mapbox-gl-js/v2.9.1/mapbox-gl.css' rel='stylesheet' />
 @endsection
 
 @section('headscripts')
-<script src='https://api.mapbox.com/mapbox-gl-js/v1.11.1/mapbox-gl.js'></script>
+<script src='https://api.mapbox.com/mapbox-gl-js/v2.9.1/mapbox-gl.js'></script>
 @endsection
 
 @section('adminContent')

diff --git a/resources/views/admin/settings/map/app_mapbox_style.blade.php b/resources/views/admin/settings/map/app_mapbox_style.blade.php
@@ -4,7 +4,7 @@
   <div class="form-group">
     <label><b>Mapbox Style URL</b></label>
     <p class="text-muted text-smaller">
-      Ingrese el estilo de Mapbox. Puede utilizar estilos ya definidos por Mapbox (Por ejemplo: <code>mapbox://styles/mapbox/light-v10</code>) o crear estilos de mapa custom desde Mapbox Studio. Para más información, visite <a href="https://docs.mapbox.com/help/glossary/style-url/" target="_blank">https://docs.mapbox.com/help/glossary/style-url/</a>
+      Ingrese el estilo de Mapbox. Puede utilizar estilos ya definidos por Mapbox (Por ejemplo: <code>mapbox://styles/mapbox/light-v11</code>) o crear estilos de mapa custom desde Mapbox Studio. Para más información, visite <a href="https://docs.mapbox.com/help/glossary/style-url/" target="_blank">https://docs.mapbox.com/help/glossary/style-url/</a>
     </p>
     <input type="hidden"  name="name" value="app_mapbox_style" >
     <input type="hidden"  name="type" value="string" >

diff --git a/resources/views/admin/settings/map/edit.blade.php b/resources/views/admin/settings/map/edit.blade.php
@@ -1,11 +1,11 @@
 @extends('admin.master')
 
 @section('stylesheets')
-<link href='https://api.mapbox.com/mapbox-gl-js/v1.11.1/mapbox-gl.css' rel='stylesheet' />
+<link href='https://api.mapbox.com/mapbox-gl-js/v2.9.1/mapbox-gl.css' rel='stylesheet' />
 @endsection
 
 @section('headscripts')
-<script src='https://api.mapbox.com/mapbox-gl-js/v1.11.1/mapbox-gl.js'></script>
+<script src='https://api.mapbox.com/mapbox-gl-js/v2.9.1/mapbox-gl.js'></script>
 @endsection
 
 @section('adminContent')
@@ -14,7 +14,7 @@
 <h3 class="is-700">Mapas y Georeferencia</h3>
 
   <div class="alert alert-dark">
-    <i class="fas fa-info-circle"></i> Mapas y georeferencias utiliza mapbox-gl-js/v1.11.1 
+    <i class="fas fa-info-circle"></i> Mapas y georeferencias utiliza mapbox-gl-js/v2.9.1 
   </div>
 
  <p class="lead">Los siguientes son campos para habilitar y configurar mapas y georeferencias en la plataforma</p>

diff --git a/resources/views/objective/manage/configuration.blade.php b/resources/views/objective/manage/configuration.blade.php
@@ -3,11 +3,11 @@
 @extends('objective.manage.master')
 
 @section('stylesheets')
-<link href='https://api.mapbox.com/mapbox-gl-js/v1.11.1/mapbox-gl.css' rel='stylesheet' />
+<link href='https://api.mapbox.com/mapbox-gl-js/v2.9.1/mapbox-gl.css' rel='stylesheet' />
 @endsection
 
 @section('headscripts')
-<script src='https://api.mapbox.com/mapbox-gl-js/v1.11.1/mapbox-gl.js'></script>
+<script src='https://api.mapbox.com/mapbox-gl-js/v2.9.1/mapbox-gl.js'></script>
 @endsection
 
 @section('panelContent')
@@ -51,7 +51,7 @@
     @csrf
     <h5 class="font-weight-bold"><i class="far fa-eye"></i> Definir centro y zoom por defecto del mapa</h5>
     <p>Defina el centro y zoom por defecto del mapa, para asegurar que los reportes del objetivo se vean de forma contenida dentro del area del mapa</p>
-    <set-map-default access-token="{{config('services.mapbox.key')}}" map-style="{{config('services.mapbox.style')}}" :lat="{{$objective->map_lat ?: 'undefined'}}" :long="{{$objective->map_long ?: 'undefined'}}" :zoom="{{$objective->map_zoom ?: 'undefined'}}"></set-map-default>
+    <set-map-default access-token="{{app_setting('app_mapbox_api_key')}}" map-style="{{app_setting('app_mapbox_style')}}" :lat="{{$objective->map_lat ?: 'undefined'}}" :long="{{$objective->map_long ?: 'undefined'}}" :zoom="{{$objective->map_zoom ?: 'undefined'}}"></set-map-default>
   </form>
   <hr>
   <h5 class="is-700 has-text-danger"><i class="fas fa-trash"></i> Eliminar objetivo</h5>

diff --git a/resources/views/objective/manage/goals/reports/map.blade.php b/resources/views/objective/manage/goals/reports/map.blade.php
@@ -8,13 +8,13 @@
 @extends('objective.manage.goals.reports.master')
 
 @section('stylesheets')
-<link href='https://api.mapbox.com/mapbox-gl-js/v1.11.1/mapbox-gl.css' rel='stylesheet' />
-<link href='https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-draw/v1.0.9/mapbox-gl-draw.css' rel='stylesheet' type='text/css' />
+<link href='https://api.mapbox.com/mapbox-gl-js/v2.9.1/mapbox-gl.css' rel='stylesheet' />
+<link rel='stylesheet' href='https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-draw/v1.4.0/mapbox-gl-draw.css' type='text/css' />
 @endsection
 
 @section('headscripts')
-<script src='https://api.mapbox.com/mapbox-gl-js/v1.11.1/mapbox-gl.js'></script>
-<script src='https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-draw/v1.0.9/mapbox-gl-draw.js'></script>
+<script src='https://api.mapbox.com/mapbox-gl-js/v2.9.1/mapbox-gl.js'></script>
+<script src='https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-draw/v1.4.0/mapbox-gl-draw.js'></script>
 @endsection
 
 

diff --git a/resources/views/objective/manage/map.blade.php b/resources/views/objective/manage/map.blade.php
@@ -1,11 +1,11 @@
 @extends('objective.manage.master')
 
 @section('stylesheets')
-<link href='https://api.mapbox.com/mapbox-gl-js/v1.11.1/mapbox-gl.css' rel='stylesheet' />
+<link href='https://api.mapbox.com/mapbox-gl-js/v2.9.1/mapbox-gl.css' rel='stylesheet' />
 @endsection
 
 @section('headscripts')
-<script src='https://api.mapbox.com/mapbox-gl-js/v1.11.1/mapbox-gl.js'></script>
+<script src='https://api.mapbox.com/mapbox-gl-js/v2.9.1/mapbox-gl.js'></script>
 @endsection
 
 
@@ -14,8 +14,9 @@
 <section>
   <h1 class="">Mapa de reportes</h1>
   <p>A continuación podrás ver todos los reportes que estén georeferenciados</p>
-  <map-reports fetch-url="{{route('apiService.objectives.reports',['objectiveId' => $objective->id, 'mappable'=> true])}}" access-token="{{config('services.mapbox.key')}}" map-style="{{config('services.mapbox.style')}}" :lat="{{$objective->map_lat ?: app_setting('app_map_lat_default')}}" :long="{{$objective->map_long ?: app_setting('app_map_long_default')}}" :zoom="{{$objective->map_zoom ?: app_setting('app_map_zoom_default')}}">
+  <map-reports fetch-url="{{route('apiService.objectives.reports',['objectiveId' => $objective->id, 'mappable'=> true])}}" access-token="{{app_setting('app_mapbox_api_key')}}" map-style="{{app_setting('app_mapbox_style')}}" :lat="{{$objective->map_lat ?: app_setting('app_map_lat_default')}}" :long="{{$objective->map_long ?: app_setting('app_map_long_default')}}" :zoom="{{$objective->map_zoom ?: app_setting('app_map_zoom_default')}}">
 
 </section>
 
 @endsection
+
diff --git a/resources/views/portal/home.blade.php b/resources/views/portal/home.blade.php
@@ -3,11 +3,11 @@
 @endphp
 
 @section('stylesheets')
-<link href='https://api.mapbox.com/mapbox-gl-js/v1.11.1/mapbox-gl.css' rel='stylesheet' />
+<link href='https://api.mapbox.com/mapbox-gl-js/v2.9.1/mapbox-gl.css' rel='stylesheet' />
 @endsection
 
 @section('headscripts')
-<script src='https://api.mapbox.com/mapbox-gl-js/v1.11.1/mapbox-gl.js'></script>
+<script src='https://api.mapbox.com/mapbox-gl-js/v2.9.1/mapbox-gl.js'></script>
 @endsection
 
 @extends('layouts.app')

diff --git a/resources/views/report/view.blade.php b/resources/views/report/view.blade.php
@@ -3,11 +3,11 @@
 @endsection
 
 @section('stylesheets')
-<link href='https://api.mapbox.com/mapbox-gl-js/v1.11.1/mapbox-gl.css' rel='stylesheet' />
+<link href='https://api.mapbox.com/mapbox-gl-js/v2.9.1/mapbox-gl.css' rel='stylesheet' />
 @endsection
 
 @section('headscripts')
-<script src='https://api.mapbox.com/mapbox-gl-js/v1.11.1/mapbox-gl.js'></script>
+<script src='https://api.mapbox.com/mapbox-gl-js/v2.9.1/mapbox-gl.js'></script>
 @endsection
 
 @extends('layouts.app')
-Original file line number
+Diff line change
@@ Expand Up / @@ -229,7 +229,7 @@ h5,h6{ @@
     }
     #app{
-      background-color: #f2f2f2;
+      background-color: #f5f5f5;
       padding-bottom: 75px;
     }
@@ Expand Down @@