Carto en local pour dev sur Crozet et modifs suite au passage sous windows
|
@ -1,5 +1,6 @@
|
||||||
/includes/config.php
|
/includes/config.php
|
||||||
/medias/*
|
/medias/*
|
||||||
|
/_maps
|
||||||
*.sublime-project
|
*.sublime-project
|
||||||
*.sublime-workspace
|
*.sublime-workspace
|
||||||
*.log
|
*.log
|
Before Width: | Height: | Size: 5.7 KiB After Width: | Height: | Size: 5.7 KiB |
|
@ -6,10 +6,7 @@
|
||||||
|
|
||||||
-- object: kabano | type: ROLE --
|
-- object: kabano | type: ROLE --
|
||||||
-- DROP ROLE IF EXISTS kabano;
|
-- DROP ROLE IF EXISTS kabano;
|
||||||
CREATE ROLE kabano WITH
|
|
||||||
INHERIT
|
|
||||||
LOGIN
|
|
||||||
ENCRYPTED PASSWORD '********';
|
|
||||||
-- ddl-end --
|
-- ddl-end --
|
||||||
|
|
||||||
|
|
||||||
|
@ -42,7 +39,7 @@ SET search_path TO pg_catalog,public,topology;
|
||||||
-- DROP EXTENSION IF EXISTS postgis CASCADE;
|
-- DROP EXTENSION IF EXISTS postgis CASCADE;
|
||||||
CREATE EXTENSION postgis
|
CREATE EXTENSION postgis
|
||||||
WITH SCHEMA public
|
WITH SCHEMA public
|
||||||
VERSION '2.5.1';
|
VERSION '3.0.1';
|
||||||
-- ddl-end --
|
-- ddl-end --
|
||||||
COMMENT ON EXTENSION postgis IS 'PostGIS geometry, geography, and raster spatial types and functions';
|
COMMENT ON EXTENSION postgis IS 'PostGIS geometry, geography, and raster spatial types and functions';
|
||||||
-- ddl-end --
|
-- ddl-end --
|
||||||
|
@ -51,7 +48,7 @@ COMMENT ON EXTENSION postgis IS 'PostGIS geometry, geography, and raster spatial
|
||||||
-- DROP EXTENSION IF EXISTS postgis_topology CASCADE;
|
-- DROP EXTENSION IF EXISTS postgis_topology CASCADE;
|
||||||
CREATE EXTENSION postgis_topology
|
CREATE EXTENSION postgis_topology
|
||||||
WITH SCHEMA topology
|
WITH SCHEMA topology
|
||||||
VERSION '2.5.1';
|
VERSION '3.0.1';
|
||||||
-- ddl-end --
|
-- ddl-end --
|
||||||
COMMENT ON EXTENSION postgis_topology IS 'PostGIS topology spatial types and functions';
|
COMMENT ON EXTENSION postgis_topology IS 'PostGIS topology spatial types and functions';
|
||||||
-- ddl-end --
|
-- ddl-end --
|
||||||
|
|
|
@ -34,7 +34,7 @@ if(isset($controller->splitted_url[1]) && $user->rankIsHigher("moderator")) {
|
||||||
}
|
}
|
||||||
|
|
||||||
chdir($config['logs_folder']);
|
chdir($config['logs_folder']);
|
||||||
exec("tail -n 200 ".$files_list[$filenb+2]." | tac", $output);
|
//exec("tail -n 200 ".$files_list[$filenb+2]." | tac", $output);
|
||||||
|
|
||||||
include ($config['views_folder']."d.admin.logs.html");
|
include ($config['views_folder']."d.admin.logs.html");
|
||||||
}
|
}
|
||||||
|
|
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 44 KiB |
Before Width: | Height: | Size: 356 B After Width: | Height: | Size: 356 B |
Before Width: | Height: | Size: 5.7 KiB After Width: | Height: | Size: 5.7 KiB |
Before Width: | Height: | Size: 5.7 KiB After Width: | Height: | Size: 5.7 KiB |
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 27 KiB |
|
@ -2,20 +2,22 @@ var mymap;
|
||||||
|
|
||||||
$( document ).ready(function() {
|
$( document ).ready(function() {
|
||||||
// Differents layers for the map
|
// Differents layers for the map
|
||||||
var osmfr = L.tileLayer('//{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png', {maxZoom: 20, attribution: 'Maps © <a href="http://www.openstreetmap.fr">OpenSreetMap France</a>, Data © <a href="http://www.openstreetmap.org/copyright">OpenStreetMap contributors</a>'});
|
var osmfr = L.tileLayer('//{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png', {tms: true, maxZoom: 20, attribution: 'Maps © <a href="http://www.openstreetmap.fr">OpenSreetMap France</a>, Data © <a href="http://www.openstreetmap.org/copyright">OpenStreetMap contributors</a>'});
|
||||||
var wikimedia = L.tileLayer('//maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png', {maxZoom: 18, attribution: 'Maps © <a href="http://wikimedia.org">Wikimedia</a>, Data © <a href="http://www.openstreetmap.org/copyright">OpenStreetMap contributors</a>'});
|
var wikimedia = L.tileLayer('//maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png', {tms: true, maxZoom: 18, attribution: 'Maps © <a href="http://wikimedia.org">Wikimedia</a>, Data © <a href="http://www.openstreetmap.org/copyright">OpenStreetMap contributors</a>'});
|
||||||
|
var crozet = L.tileLayer('/_maps/osm_cro/{z}/{x}/{y}.png', {tms: true, maxZoom: 18, attribution: 'For dev purpose only'});
|
||||||
|
|
||||||
// Base layers
|
// Base layers
|
||||||
var baseLayers = {
|
var baseLayers = {
|
||||||
"OSM France": osmfr,
|
"OSM France": osmfr,
|
||||||
"OSM Wikimedia": wikimedia,
|
"OSM Wikimedia": wikimedia,
|
||||||
|
"Crozet": crozet,
|
||||||
};
|
};
|
||||||
|
|
||||||
mymap = L.map('mapid', {
|
mymap = L.map('mapid', {
|
||||||
zoomControl: false,
|
zoomControl: false,
|
||||||
layers: [wikimedia],
|
layers: [crozet],
|
||||||
}).setView([47.018, 3.142], 6);
|
}).setView([-46.407, 51.766], 12);
|
||||||
$("#map-credits").html(wikimedia.getAttribution());
|
$("#map-credits").html(crozet.getAttribution());
|
||||||
|
|
||||||
L.control.scale({
|
L.control.scale({
|
||||||
position: "bottomleft",
|
position: "bottomleft",
|
||||||
|
|
Before Width: | Height: | Size: 673 KiB After Width: | Height: | Size: 673 KiB |
Before Width: | Height: | Size: 139 KiB After Width: | Height: | Size: 139 KiB |
0
views/third/fontawesome-free-5.4.1-web/webfonts/fa-regular-400.woff2
Normal file → Executable file
Before Width: | Height: | Size: 708 KiB After Width: | Height: | Size: 708 KiB |