Skip to content

Commit

Permalink
add foss4g logo to map
Browse files Browse the repository at this point in the history
  • Loading branch information
rami-dv committed May 20, 2024
1 parent f2f63d3 commit e6032f0
Show file tree
Hide file tree
Showing 7 changed files with 246 additions and 13 deletions.
2 changes: 1 addition & 1 deletion public/map/sprite.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"airport":{"height":100,"pixelRatio":1,"width":100,"x":0,"y":0},"bar":{"height":100,"pixelRatio":1,"width":100,"x":100,"y":0},"bed_and_breakfast":{"height":100,"pixelRatio":1,"width":100,"x":200,"y":0},"beira-rio":{"height":100,"pixelRatio":1,"width":100,"x":300,"y":0},"estacao-das-docas":{"height":100,"pixelRatio":1,"width":100,"x":400,"y":0},"forte-do-castelo":{"height":100,"pixelRatio":1,"width":100,"x":0,"y":100},"hangar":{"height":100,"pixelRatio":1,"width":100,"x":0,"y":200},"hostel":{"height":100,"pixelRatio":1,"width":100,"x":0,"y":300},"hotel":{"height":100,"pixelRatio":1,"width":100,"x":0,"y":400},"ifpa-belem":{"height":100,"pixelRatio":1,"width":100,"x":100,"y":100},"mangal-das-garcas":{"height":100,"pixelRatio":1,"width":100,"x":200,"y":100},"palacete-bolonha":{"height":100,"pixelRatio":1,"width":100,"x":300,"y":100},"restaurant":{"height":100,"pixelRatio":1,"width":100,"x":400,"y":100},"star":{"height":100,"pixelRatio":1,"width":100,"x":100,"y":200}}
{"airport":{"height":100,"pixelRatio":1,"width":100,"x":737,"y":0},"bar":{"height":100,"pixelRatio":1,"width":100,"x":837,"y":0},"bed_and_breakfast":{"height":100,"pixelRatio":1,"width":100,"x":737,"y":100},"beira-rio":{"height":100,"pixelRatio":1,"width":100,"x":837,"y":100},"estacao-das-docas":{"height":100,"pixelRatio":1,"width":100,"x":737,"y":200},"forte-do-castelo":{"height":100,"pixelRatio":1,"width":100,"x":837,"y":200},"foss4g-logo":{"height":722,"pixelRatio":1,"width":737,"x":0,"y":0},"hangar":{"height":100,"pixelRatio":1,"width":100,"x":737,"y":300},"hostel":{"height":100,"pixelRatio":1,"width":100,"x":837,"y":300},"hotel":{"height":100,"pixelRatio":1,"width":100,"x":737,"y":400},"ifpa-belem":{"height":100,"pixelRatio":1,"width":100,"x":837,"y":400},"mangal-das-garcas":{"height":100,"pixelRatio":1,"width":100,"x":737,"y":500},"palacete-bolonha":{"height":100,"pixelRatio":1,"width":100,"x":837,"y":500},"restaurant":{"height":100,"pixelRatio":1,"width":100,"x":737,"y":600},"star":{"height":100,"pixelRatio":1,"width":100,"x":837,"y":600}}
Binary file modified public/map/sprite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
199 changes: 199 additions & 0 deletions public/map/sprite/foss4g-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion public/map/sprite@2x.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"airport":{"height":200,"pixelRatio":2,"width":200,"x":0,"y":0},"bar":{"height":200,"pixelRatio":2,"width":200,"x":200,"y":0},"bed_and_breakfast":{"height":200,"pixelRatio":2,"width":200,"x":400,"y":0},"beira-rio":{"height":200,"pixelRatio":2,"width":200,"x":600,"y":0},"estacao-das-docas":{"height":200,"pixelRatio":2,"width":200,"x":800,"y":0},"forte-do-castelo":{"height":200,"pixelRatio":2,"width":200,"x":0,"y":200},"hangar":{"height":200,"pixelRatio":2,"width":200,"x":0,"y":400},"hostel":{"height":200,"pixelRatio":2,"width":200,"x":0,"y":600},"hotel":{"height":200,"pixelRatio":2,"width":200,"x":0,"y":800},"ifpa-belem":{"height":200,"pixelRatio":2,"width":200,"x":200,"y":200},"mangal-das-garcas":{"height":200,"pixelRatio":2,"width":200,"x":400,"y":200},"palacete-bolonha":{"height":200,"pixelRatio":2,"width":200,"x":600,"y":200},"restaurant":{"height":200,"pixelRatio":2,"width":200,"x":800,"y":200},"star":{"height":200,"pixelRatio":2,"width":200,"x":200,"y":400}}
{"airport":{"height":200,"pixelRatio":2,"width":200,"x":1474,"y":0},"bar":{"height":200,"pixelRatio":2,"width":200,"x":1674,"y":0},"bed_and_breakfast":{"height":200,"pixelRatio":2,"width":200,"x":1474,"y":200},"beira-rio":{"height":200,"pixelRatio":2,"width":200,"x":1674,"y":200},"estacao-das-docas":{"height":200,"pixelRatio":2,"width":200,"x":1474,"y":400},"forte-do-castelo":{"height":200,"pixelRatio":2,"width":200,"x":1674,"y":400},"foss4g-logo":{"height":1444,"pixelRatio":2,"width":1474,"x":0,"y":0},"hangar":{"height":200,"pixelRatio":2,"width":200,"x":1474,"y":600},"hostel":{"height":200,"pixelRatio":2,"width":200,"x":1674,"y":600},"hotel":{"height":200,"pixelRatio":2,"width":200,"x":1474,"y":800},"ifpa-belem":{"height":200,"pixelRatio":2,"width":200,"x":1674,"y":800},"mangal-das-garcas":{"height":200,"pixelRatio":2,"width":200,"x":1474,"y":1000},"palacete-bolonha":{"height":200,"pixelRatio":2,"width":200,"x":1674,"y":1000},"restaurant":{"height":200,"pixelRatio":2,"width":200,"x":1474,"y":1200},"star":{"height":200,"pixelRatio":2,"width":200,"x":1674,"y":1200}}
Binary file modified public/map/sprite@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
56 changes: 45 additions & 11 deletions src/components/ConferenceMap.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ const getMapStyle = ({
properties: {},
geometry: {
type: "Point",
coordinates: [-48.4764625, -1.4519607],
coordinates: [-48.4764625, -1.4529607],
},
},
],
Expand Down Expand Up @@ -394,6 +394,42 @@ const getMapStyle = ({
],
},
},
{
id: "foss4g-logo",
type: "symbol",
source: "belemLabel",
minzoom: 11,
maxzoom: 13.5,
layout: {
"icon-image": "foss4g-logo",
"icon-ignore-placement": true,
"icon-allow-overlap": true,
"icon-optional": false,
"icon-size": [
"interpolate",
["exponential", 1.3],
["zoom"],
10,
0.01,
13.5,
0.75,
],
},
paint: {
"icon-opacity": [
"interpolate",
["exponential", 0.9],
["zoom"],
11,
0,
11.5,
0.6,
13.5,
0,
],
},
},

{
id: "roads_other",
type: "line",
Expand Down Expand Up @@ -564,7 +600,6 @@ const getMapStyle = ({
],
},
},

{
id: "bairros-border",
type: "line",
Expand All @@ -582,7 +617,6 @@ const getMapStyle = ({
0.8,
],
"line-width": 1.5,

},
},
{
Expand Down Expand Up @@ -697,32 +731,32 @@ const getMapStyle = ({
id: "belem-label",
type: "symbol",
source: "belemLabel",
minzoom: 10,
minzoom: 11,
maxzoom: 13.5,
layout: {
"text-font": ["literal", ["Noto Sans SemiCondensed Regular"]],
"text-field": "Belém",
"text-size": 40,
"text-ignore-placement": true,
"text-allow-overlap": true
"text-allow-overlap": true,
},
paint: {
"text-opacity": [
"interpolate",
["exponential", 1],
["zoom"],
10,
11,
0,
10.5,
11.5,
1,
13,
1,
13.5,
0
0,
],
"text-color": "#552f27",
"text-halo-width": 2,
"text-halo-blur": 0.5,
"text-halo-width": 4,
"text-halo-blur": 2,
"text-halo-color": "rgba(255,255,255,0.8)",
},
},
Expand Down Expand Up @@ -750,7 +784,7 @@ const getMapStyle = ({
0,
12.5,
1,
]
],
},
filter: [
"in",
Expand Down
Binary file modified src/images/belem/Thumbs.db
Binary file not shown.

0 comments on commit e6032f0

Please sign in to comment.