Skip to content

Commit 13807a8

Browse files
committed
fix(font-awesome 6): set pin marker default color to be backwards compatible
ensures easier upgrades (changing url path only)
1 parent 3968632 commit 13807a8

File tree

4 files changed

+11
-24
lines changed

4 files changed

+11
-24
lines changed

app/Http/Controllers/API/v3/FontAwesome/v6/PinController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ protected function showIconPin(Request $request)
4040

4141
// BACKGROUND ICON
4242
$backgroundIcon = 'fa-solid fa-location-pin';
43-
$backgroundIconColor = '#'.$request->get('background', 'CCC');
43+
$backgroundIconColor = '#'.$request->get('background', 'de604e');
4444
$backgroundIconMarkup = GetIconMarkup::run($backgroundIcon);
4545

4646
// LABEL
@@ -76,7 +76,7 @@ protected function showTextPin(Request $request)
7676

7777
// BACKGROUND ICON
7878
$backgroundIcon = 'fa-solid fa-location-pin';
79-
$backgroundIconColor = '#'.$request->get('background', 'CCC');
79+
$backgroundIconColor = '#'.$request->get('background', 'de604e');
8080
$backgroundIconMarkup = GetIconMarkup::run($backgroundIcon);
8181

8282
// LABEL

resources/views/docs/integrations/bing-maps.blade.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function loadMapScenario() {
1818
disableScrollWheelZoom: true
1919
});
2020
var pushpin = new Microsoft.Maps.Pushpin(map.getCenter(), {
21-
icon: '{{ config('app.url') }}/api/v2/font-awesome/v5/pin?icon=fa-star-solid&size=50&hoffset=0&voffset=-1',
21+
icon: '{{ config('app.url') }}/api/v3/font-awesome/v6/pin?icon=fa-solid+fa-star&size=50&hoffset=0&voffset=-1',
2222
anchor: new Microsoft.Maps.Point(12, 39)
2323
});
2424
map.entities.push(pushpin);
@@ -31,8 +31,8 @@ function loadMapScenario() {
3131
credentials: 'Your Bing Maps Key'
3232
});
3333

34-
var pushpin = new Microsoft.Maps.Pushpin(map.getCenter(), {
35-
icon: '{{ config('app.url') }}/api/v2/font-awesome/v5/pin?icon=fa-star-solid&size=50&hoffset=0&voffset=-1',
34+
var pushpin = new Microsoft.Maps.Pushpin(map.getCenter(), {
35+
icon: '{{ config('app.url') }}/api/v3/font-awesome/v6/pin?icon=fa-solid+fa-star&size=50&hoffset=0&voffset=-1',
3636
anchor: new Microsoft.Maps.Point(12, 39)
3737
});
3838

resources/views/docs/integrations/google-maps.blade.php

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ function initMap() {
2525
});
2626
var marker = new google.maps.Marker({
2727
position: uluru,
28-
icon: '{{ config('app.url') }}/api/v2/font-awesome/v5/pin?icon=fa-star-solid&size=50&hoffset=0&voffset=-1',
28+
icon: '{{ config('app.url') }}/api/v3/font-awesome/v6/pin?icon=fa-solid+fa-star&size=50&hoffset=0&voffset=-1',
2929
map: map
3030
});
3131
}
@@ -38,27 +38,14 @@ function initMap() {
3838
zoom: 4,
3939
center: uluru
4040
});
41-
41+
4242
// a more conventional map pin
4343
var marker = new google.maps.Marker({
4444
position: uluru,
45-
icon: '{{ config('app.url') }}/api/v2/font-awesome/v5/pin?icon=fa-star-solid&size=50&hoffset=0&voffset=-1',
45+
icon: '{{ config('app.url') }}/api/v3/font-awesome/v6/pin?icon=fa-solid+fa-star&size=50&hoffset=0&voffset=-1',
4646
map: map
4747
});
48-
49-
// a square icon whose center is on the lat / long
50-
var circle = new google.maps.Marker({
51-
position: {lat: 37.827125, lng: -122.422844},
52-
map: map,
53-
icon: {
54-
size: new google.maps.Size(120, 120),
55-
scaledSize: new google.maps.Size(60,60),
56-
url: 'https://cdn.mapmarker.io/api/v1/fa?size=120&icon=fa-bullseye&color=%23D33115',
57-
anchor: new google.maps.Point(30, 30),
58-
},
59-
title: "Alert",
60-
});
61-
48+
6249
}</pre>
6350

6451
</x-docs-box>

resources/views/docs/integrations/mapbox.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
2929
var markerElement = document.createElement('div');
3030
markerElement.style.backgroundImage =
31-
"url('{{ config('app.url') }}/api/v2/font-awesome/v5/pin?icon=fa-star-solid&size=50&hoffset=0&voffset=-1')";
31+
"url('{{ config('app.url') }}/api/v3/font-awesome/v6/pin?icon=fa-solid+fa-star&size=50&hoffset=0&voffset=-1')";
3232
markerElement.style.width = '50px';
3333
markerElement.style.height = '50px';
3434
@@ -39,7 +39,7 @@
3939
.addTo(map);
4040
</script>
4141
<pre>var markerElement = document.createElement('div');
42-
markerElement.style.backgroundImage = "url('{{ config('app.url') }}/api/v2/font-awesome/v5/pin?icon=fa-star-solid&size=50&hoffset=0&voffset=-1')";
42+
markerElement.style.backgroundImage = "url('{{ config('app.url') }}/api/v3/font-awesome/v6/pin?icon=fa-solid+fa-star&size=50&hoffset=0&voffset=-1')";
4343
markerElement.style.width = '50px';
4444
markerElement.style.height = '50px';
4545

0 commit comments

Comments
 (0)