Commit 205fa14c authored by Adrien Pavie's avatar Adrien Pavie

Search tool added, logo created, icons for columns and screens

parent 06939346
......@@ -48,6 +48,7 @@ images:
nm_assets:
cp $(NM_FOLDER)/leaflet/dist/images/* $(DIST_FOLDER)/img/
cp $(NM_FOLDER)/leaflet-geosearch/src/img/* $(DIST_FOLDER)/img/
css:
$(NPMCSS) $(SRC_FOLDER)/css/OAM.css > $(CSS_OUT)
......
......@@ -31,6 +31,7 @@
},
"dependencies": {
"leaflet": "^1.0.2",
"leaflet-geosearch": "^1.0.0",
"leaflet-hash": "^0.2.1",
"leaflet-overpass-layer": "^2.4.1"
}
......
......@@ -21,6 +21,7 @@
/** Node modules imports **/
@import "../../node_modules/leaflet/dist/leaflet.css";
@import "../../node_modules/leaflet-geosearch/src/css/l.geosearch.css";
@import "../../node_modules/leaflet-overpass-layer/dist/OverPassLayer.css";
......@@ -50,8 +51,17 @@ header {
}
header img.logo {
height: 40px;
margin: 5px 10px;
height: 50px;
margin: 0px 10px;
}
header span.catch {
float: right;
font-style: italic;
line-height: 50px;
vertical-align: middle;
margin-right: 10px;
color: #6C7A89;
}
#openadvertmap {
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 32 32.000001">
<defs>
<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="1032" cx="15.58" gradientTransform="matrix(.36096 0 0 .82993 10.376 -837.43)" r="13.515">
<stop stop-color="#ff0018" offset="0"/>
<stop stop-color="#fff600" offset="1"/>
</radialGradient>
</defs>
<g fill-rule="evenodd">
<rect style="color-rendering:auto;color:#000000;isolation:auto;mix-blend-mode:normal;shape-rendering:auto;solid-color:#000000;image-rendering:auto" height="21.443" width="9.4428" stroke="#a2a2a2" y="8.2786" x="11.279" stroke-width=".55727" fill="url(#a)"/>
<rect style="color-rendering:auto;color:#000000;isolation:auto;mix-blend-mode:normal;shape-rendering:auto;solid-color:#000000;image-rendering:auto" height="2" width="12" y="30" x="10" fill="#7e7e7e"/>
<rect style="color-rendering:auto;color:#000000;isolation:auto;mix-blend-mode:normal;shape-rendering:auto;solid-color:#000000;image-rendering:auto" height="2" width="12" y="6" x="10" fill="#7e7e7e"/>
<path style="color-rendering:auto;color:#000000;isolation:auto;mix-blend-mode:normal;shape-rendering:auto;solid-color:#000000;image-rendering:auto" fill="#a2a2a2" d="m11 6a5 3.0864 0 0 1 5 -3.0864 5 3.0864 0 0 1 5 3.0864h-5z"/>
<path d="m14.921 3.1644 1.0786-2.3011 1.0786 2.3011h-2.1573z" fill="#a2a2a2"/>
</g>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="25" width="50" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 50 25.000001">
<defs>
<filter id="a" style="color-interpolation-filters:sRGB">
<feFlood result="flood" flood-opacity=".58824" flood-color="rgb(74,74,74)"/>
<feComposite operator="in" result="composite1" in2="SourceGraphic" in="flood"/>
<feGaussianBlur stdDeviation="2" result="blur" in="composite1"/>
<feOffset result="offset" dx="0" dy="0"/>
<feComposite operator="atop" result="composite2" in2="offset" in="offset"/>
</filter>
</defs>
<path fill-rule="evenodd" style="color-rendering:auto;text-decoration-color:#000000;color:#000000;isolation:auto;mix-blend-mode:normal;shape-rendering:auto;solid-color:#000000;block-progression:tb;text-decoration-line:none;text-decoration-style:solid;image-rendering:auto;white-space:normal;text-indent:0;text-transform:none" d="m27.186-2.5-1.6682 1.6983c-2.3303 0.23336-4.0069 1.2477-4.0098 2.426h-1l-0.67797 1.6058h1l-8.8814 17.664h-1l-0.949 1.606h12l0.94915-1.6058h-1l8.8814-17.664h1l0.67797-1.6058h-1c-0.000092-1.1798-1.6783-2.1959-4.0117-2.4291z" transform="matrix(.83333 0 0 .83333 1.2915 4.1667)" filter="url(#a)" fill="#a2a2a2"/>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="256mm"
height="64mm"
viewBox="0 0 907.08663 226.77165"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="logo.svg">
<defs
id="defs4">
<radialGradient
r="13.515"
gradientTransform="matrix(1.1868,0,0,0.7372,-2.4908,269.6)"
cx="15.58"
cy="1032"
gradientUnits="userSpaceOnUse"
id="a">
<stop
id="stop4160"
offset="0"
stop-color="#ff0018" />
<stop
id="stop4162"
offset="1"
stop-color="#fff600" />
</radialGradient>
<filter
style="color-interpolation-filters:sRGB"
id="a-3">
<feFlood
id="feFlood4185"
flood-color="rgb(74,74,74)"
flood-opacity=".58824"
result="flood" />
<feComposite
id="feComposite4187"
in="flood"
in2="SourceGraphic"
result="composite1"
operator="in" />
<feGaussianBlur
id="feGaussianBlur4189"
in="composite1"
result="blur"
stdDeviation="2" />
<feOffset
id="feOffset4191"
dy="0"
dx="0"
result="offset" />
<feComposite
id="feComposite4193"
in="offset"
in2="offset"
result="composite2"
operator="atop" />
</filter>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.7"
inkscape:cx="470.56683"
inkscape:cy="41.323695"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1280"
inkscape:window-height="962"
inkscape:window-x="1280"
inkscape:window-y="72"
inkscape:window-maximized="1" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-825.59056)">
<g
id="g4211"
transform="matrix(4.5680633,0,0,4.5680633,-836.78023,-3605.0131)">
<g
transform="translate(189.46782,-42.590088)"
id="g4195">
<path
inkscape:connector-curvature="0"
style="color:#000000;isolation:auto;mix-blend-mode:normal;solid-color:#000000;fill:#a2a2a2;fill-rule:evenodd;filter:url(#a-3);color-rendering:auto;image-rendering:auto;shape-rendering:auto"
d="m 17.143,1032.6 -10.893,12.3 13,0 -6.25,7.4129 6,0 6.25,-7.4129 13,0 10.893,-12.355 z"
transform="matrix(0.96696,0,0,1.0589,0.17935,-62.09)"
id="path4197" />
</g>
<g
style="fill-rule:evenodd"
transform="translate(190.07125,-42.571134)"
id="g4164">
<rect
style="color:#000000;isolation:auto;mix-blend-mode:normal;solid-color:#000000;fill:url(#a);stroke:#7e7e7e;stroke-width:0.95235002;color-rendering:auto;image-rendering:auto;shape-rendering:auto"
height="19.048"
width="31.048"
y="1020.8"
x="0.47617999"
id="rect4166" />
<rect
style="color:#000000;isolation:auto;mix-blend-mode:normal;solid-color:#000000;fill:#a2a2a2;color-rendering:auto;image-rendering:auto;shape-rendering:auto"
height="12"
width="6"
y="1040.4"
x="13"
id="rect4168" />
</g>
</g>
<flowRoot
xml:space="preserve"
id="flowRoot4218"
style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
transform="translate(34.285714,831.67786)"><flowRegion
id="flowRegion4220"><rect
id="rect4222"
width="684.28571"
height="145.71428"
x="215.71428"
y="49.628796" /></flowRegion><flowPara
id="flowPara4224"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:80px;font-family:sans-serif;-inkscape-font-specification:sans-serif">OpenAdvertMap</flowPara></flowRoot> </g>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 32 32.000001">
<defs>
<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="1032" cx="15.58" gradientTransform="matrix(1.1868 0 0 .7372 -2.4908 -750.8)" r="13.515">
<stop stop-color="#a832e7" offset="0"/>
<stop stop-color="#99def0" offset="1"/>
</radialGradient>
</defs>
<rect style="color-rendering:auto;color:#000000;isolation:auto;mix-blend-mode:normal;shape-rendering:auto;solid-color:#000000;image-rendering:auto" fill-rule="evenodd" height="19.048" width="31.048" stroke="#7e7e7e" y=".39999" x=".47618" stroke-width=".95235" fill="url(#a)"/>
<rect style="color-rendering:auto;color:#000000;isolation:auto;mix-blend-mode:normal;shape-rendering:auto;solid-color:#000000;image-rendering:auto" fill-rule="evenodd" height="12" width="6" y="20" x="13" fill="#a2a2a2"/>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="25" width="50" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 50 25.000001">
<defs>
<filter id="a" style="color-interpolation-filters:sRGB">
<feFlood result="flood" flood-opacity=".58824" flood-color="rgb(74,74,74)"/>
<feComposite operator="in" result="composite1" in2="SourceGraphic" in="flood"/>
<feGaussianBlur stdDeviation="2" result="blur" in="composite1"/>
<feOffset result="offset" dx="0" dy="0"/>
<feComposite operator="atop" result="composite2" in2="offset" in="offset"/>
</filter>
</defs>
<g transform="translate(-1.9607 -1029.3)">
<path style="color-rendering:auto;color:#000000;isolation:auto;mix-blend-mode:normal;shape-rendering:auto;solid-color:#000000;image-rendering:auto" d="m17.143 1032.6-10.893 12.3h13l-6.25 7.4129h6l6.25-7.4129h13l10.893-12.355z" fill-rule="evenodd" transform="matrix(.96696 0 0 1.0589 .17935 -62.09)" filter="url(#a)" fill="#a2a2a2"/>
</g>
</svg>
......@@ -40,7 +40,8 @@
<body>
<!-- Header -->
<header>
<a href="./" title="OpenAdvertMap"><img src="img/logo_full_light.512.png" class="logo" alt="OpenAdvertMap" /></a>
<a href="./" title="OpenAdvertMap"><img src="img/logo.png" class="logo" alt="OpenAdvertMap" /></a>
<span class="catch">Check advertisement location !</span>
</header>
<!-- OpenAdvertMap div -->
......
......@@ -17,6 +17,8 @@
let L = require("leaflet");
require("leaflet-hash");
require("leaflet-geosearch");
require("leaflet-geosearch/src/js/l.geosearch.provider.openstreetmap");
require("../../../node_modules/leaflet-overpass-layer/dist/OverPassLayer.bundle.js");
/**
......@@ -39,6 +41,13 @@ class Main {
maxZoom: 19
}).addTo(this.map);
this.mapSearch = new L.Control.GeoSearch({
provider: new L.GeoSearch.Provider.OpenStreetMap(),
position: 'topleft',
showMarker: false,
retainZoomLevel: false
}).addTo(this.map);
//Available icons
let adIconSize = [32,32];
let adIconShadowSize = [50,25];
......@@ -51,62 +60,22 @@ class Main {
iconSize: adIconSize,
iconAnchor: adIconAnchor,
popupAnchor: adIconPopupAnchor
}),
billboard: L.icon({
iconUrl: 'img/billboard.png',
iconSize: adIconSize,
iconAnchor: adIconAnchor,
shadowUrl: 'img/billboard_shadow.png',
shadowSize: adIconShadowSize,
shadowAnchor: adIconShadowAnchor,
popupAnchor: adIconPopupAnchor
}),
board: L.icon({
iconUrl: 'img/board.png',
iconSize: adIconSize,
iconAnchor: adIconAnchor,
shadowUrl: 'img/board_shadow.png',
shadowSize: adIconShadowSize,
shadowAnchor: adIconShadowAnchor,
popupAnchor: adIconPopupAnchor
}),
flag: L.icon({
iconUrl: 'img/flag.png',
iconSize: adIconSize,
iconAnchor: adIconAnchor,
shadowUrl: 'img/flag_shadow.png',
shadowSize: adIconShadowSize,
shadowAnchor: adIconShadowAnchor,
popupAnchor: adIconPopupAnchor
}),
poster_box: L.icon({
iconUrl: 'img/poster_box.png',
iconSize: adIconSize,
iconAnchor: adIconAnchor,
shadowUrl: 'img/poster_box_shadow.png',
shadowSize: adIconShadowSize,
shadowAnchor: adIconShadowAnchor,
popupAnchor: adIconPopupAnchor
}),
sign: L.icon({
iconUrl: 'img/sign.png',
iconSize: adIconSize,
iconAnchor: adIconAnchor,
shadowUrl: 'img/sign_shadow.png',
shadowSize: adIconShadowSize,
shadowAnchor: adIconShadowAnchor,
popupAnchor: adIconPopupAnchor
}),
totem: L.icon({
iconUrl: 'img/totem.png',
})
};
let adIconsList = [ "billboard", "board", "column", "flag", "poster_box", "screen", "sign", "totem" ];
for(let i=0; i < adIconsList.length; i++) {
let adIcon = adIconsList[i];
adIcons[adIcon] = L.icon({
iconUrl: 'img/'+adIcon+'.png',
iconSize: adIconSize,
iconAnchor: adIconAnchor,
shadowUrl: 'img/totem_shadow.png',
shadowUrl: 'img/'+adIcon+'_shadow.png',
shadowSize: adIconShadowSize,
shadowAnchor: adIconShadowAnchor,
popupAnchor: adIconPopupAnchor
})
};
});
}
/*
* Overpass layer
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment