Merge pull request #1 from eballo/develop

version 3.0
eballo · Nov 30, 2016 · 7d6fc38 · 7d6fc38
2 parents 4b15d82 + 4c02a34
commit 7d6fc38
Show file tree

Hide file tree

Showing 134 changed files with 2,195 additions and 106 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.qicon
diff --git a/README.md b/README.md
@@ -7,6 +7,7 @@ Interactive vectorial map of Catalunya using GoogleMaps library.
 
 - [Demo v1.0](http://demo.catalunyamedieval.es/gmap1)
 - [Demo v2.0](http://demo.catalunyamedieval.es/gmap2)
+- [Demo v3.0](http://demo.catalunyamedieval.es/gmap3)
 
 # Marker cluster Info
 http://code.google.com/p/google-maps-utility-library-v3/wiki/Libraries
@@ -19,11 +20,14 @@ http://code.google.com/p/google-maps-utility-library-v3/wiki/Libraries
 		<div id="mapContainer">
 			<div id="gMap"></div>
 		</div>
-		<script type="text/javascript" src="https://maps.google.com/maps/api/js?sensor=false"></script>
-		<script type="text/javascript" src="js/catalunya-list.js" ></script>
-		<script type="text/javascript" src="js/catalunya-catmap.js" ></script>
-		<script type="text/javascript" src="js/catalunya-options-gmap.js" ></script>
-		<script type="text/javascript" src="js/catalunya-gmap.js" ></script>
+        ...
+        <footer>
+            <script type="text/javascript" src="https://maps.google.com/maps/api/js?key=YOUR_API_KEY"></script>
+            <script type="text/javascript" src="js/catalunya-list.js" ></script>
+            <script type="text/javascript" src="js/catalunya-catmap.js" ></script>
+            <script type="text/javascript" src="js/catalunya-options-gmap.js" ></script>
+            <script type="text/javascript" src="js/catalunya-gmap.js" ></script>
+        </footer>
 ```
 2. Edit the content of catalunya-gmap.js to add, remove the markers that you want to print.
 
@@ -55,3 +59,7 @@ V1.0
 
 V2.0
 - Markers clustering
+
+V3.0
+- Add Remove/Add button by type of building + unique infoWindow
+- Change icon to a different one when is disabled (removed)
diff --git a/css/catalunya-gmap.css b/css/catalunya-gmap.css
@@ -2,10 +2,15 @@
 #mapContainer { 
     position:relative;
     width:600px;
-    height:500px;
+    height:550px;
     margin: 20px auto;
 }
 
+#mapContainer.fullscreen {
+  width:100%;
+  height: 100%;
+}
+
 #gMap {
 	position: relative; 
 	float: left; 
@@ -14,4 +19,78 @@
 	width: 100%; 
 	border: 2px solid rgba(0,0,0,0.15);
     box-shadow: 0 1px 1px rgba(50,50,50,0.1);
+}
+
+#gMap.fullscreen {
+  width:100%;
+  height: 100%;
+}
+
+/** sobrescriure styles google */
+
+.gm-style-iw {
+   top: 0 !important;
+   left: 0 !important;
+   width: 300px !important;
+   height: 150px !important;
+
+   background-color: #fff;
+}
+
+/** end sobrescriure */
+
+.infoWindowz{
+	padding:0;
+    margin:0;
+    float: left;
+    width: 300px;
+    height: 400px;
+}
+.edifici_tile-image{
+	padding: 0;
+	margin: 0;
+	display:block;
+	width:100%;
+}
+
+.infowindow_tile{
+	position:relative;
+	width:300px;
+	background:white;
+}
+.infowindow_text{
+	clear: both;
+	float: left;
+}
+
+.edifici_tile-header-titles h2{
+	clear: both;
+	font-size:10px;
+	font-weight:400;
+	letter-spacing:.01em;
+	color:black;
+	text-transform:uppercase;
+	text-align: left;
+	float: left;
+	width: 150px;
+	margin-left: 10px;
+}
+.edifici_tile-header-titles h3{
+   font-family: 'Open Sans Condensed', sans-serif;
+   font-size: 12px;
+   font-weight: 100%;
+   padding: 10px;
+   background-color: #48b5e9;
+   color: white;
+   margin: 1px;
+   margin-bottom: 10px;
+   border-radius: 2px 2px 0 0; /* In accordance with the rounding of the default infowindow corners. */
+}
+.edifici_tile-header-titles img{
+	float: right;
+	height: 100px;
+
+   	padding:1px;
+   	border:1px solid grey;
+   	background-color:black;
 }
diff --git a/img/conv30.png b/img/conv30.png
diff --git a/img/conv40.png b/img/conv40.png
diff --git a/img/conv50.png b/img/conv50.png
diff --git a/img/gmap/03.png b/img/gmap/03.png
diff --git a/img/gmap/04.png b/img/gmap/04.png
diff --git a/img/gmap/05.png b/img/gmap/05.png
diff --git a/img/gmap/06.png b/img/gmap/06.png
diff --git a/img/gmap/arrow_contract.png b/img/gmap/arrow_contract.png
diff --git a/img/gmap/civil/casaForta/casaForta1.png b/img/gmap/civil/casaForta/casaForta1.png
diff --git a/img/gmap/civil/casaForta/casaForta2.png b/img/gmap/civil/casaForta/casaForta2.png
diff --git a/img/gmap/civil/casaForta/casaForta3.png b/img/gmap/civil/casaForta/casaForta3.png
diff --git a/img/gmap/civil/casaForta/casaForta4.png b/img/gmap/civil/casaForta/casaForta4.png
diff --git a/img/gmap/civil/casaForta/casaForta5.png b/img/gmap/civil/casaForta/casaForta5.png
diff --git a/img/gmap/civil/casaForta/casaForta6.png b/img/gmap/civil/casaForta/casaForta6.png
diff --git a/img/gmap/civil/casaForta/casaForta7.png b/img/gmap/civil/casaForta/casaForta7.png
diff --git a/img/gmap/civil/casaForta/casaForta8.png b/img/gmap/civil/casaForta/casaForta8.png
diff --git a/img/gmap/civil/palau/palau1.png b/img/gmap/civil/palau/palau1.png
diff --git a/img/gmap/civil/palau/palau2.png b/img/gmap/civil/palau/palau2.png
diff --git a/img/gmap/civil/palau/palau3.png b/img/gmap/civil/palau/palau3.png
diff --git a/img/gmap/civil/palau/palau4.png b/img/gmap/civil/palau/palau4.png
diff --git a/img/gmap/civil/palau/palau5.png b/img/gmap/civil/palau/palau5.png
diff --git a/img/gmap/civil/palau/palau6.png b/img/gmap/civil/palau/palau6.png
diff --git a/img/gmap/civil/palau/palau7.png b/img/gmap/civil/palau/palau7.png
diff --git a/img/gmap/civil/palau/palau8.png b/img/gmap/civil/palau/palau8.png
diff --git a/img/gmap/civil/pont/pont1.png b/img/gmap/civil/pont/pont1.png
diff --git a/img/gmap/civil/pont/pont2.png b/img/gmap/civil/pont/pont2.png
diff --git a/img/gmap/civil/pont/pont3.png b/img/gmap/civil/pont/pont3.png
diff --git a/img/gmap/civil/pont/pont4.png b/img/gmap/civil/pont/pont4.png
diff --git a/img/gmap/civil/pont/pont5.png b/img/gmap/civil/pont/pont5.png
diff --git a/img/gmap/civil/pont/pont6.png b/img/gmap/civil/pont/pont6.png
diff --git a/img/gmap/civil/pont/pont7.png b/img/gmap/civil/pont/pont7.png
diff --git a/img/gmap/civil/pont/pont8.png b/img/gmap/civil/pont/pont8.png
diff --git a/img/gmap/civil/torreColomer/torreColomer1.png b/img/gmap/civil/torreColomer/torreColomer1.png
diff --git a/img/gmap/civil/torreColomer/torreColomer2.png b/img/gmap/civil/torreColomer/torreColomer2.png
diff --git a/img/gmap/civil/torreColomer/torreColomer3.png b/img/gmap/civil/torreColomer/torreColomer3.png
diff --git a/img/gmap/civil/torreColomer/torreColomer4.png b/img/gmap/civil/torreColomer/torreColomer4.png
diff --git a/img/gmap/civil/torreColomer/torreColomer5.png b/img/gmap/civil/torreColomer/torreColomer5.png
diff --git a/img/gmap/civil/torreColomer/torreColomer6.png b/img/gmap/civil/torreColomer/torreColomer6.png
diff --git a/img/gmap/civil/torreColomer/torreColomer7.png b/img/gmap/civil/torreColomer/torreColomer7.png
diff --git a/img/gmap/civil/torreColomer/torreColomer8.png b/img/gmap/civil/torreColomer/torreColomer8.png
diff --git a/img/gmap/delete.png b/img/gmap/delete.png
diff --git a/img/gmap/map.png b/img/gmap/map.png
diff --git a/img/gmap/militar/castell/castell1.png b/img/gmap/militar/castell/castell1.png
diff --git a/img/gmap/militar/castell/castell2.png b/img/gmap/militar/castell/castell2.png
diff --git a/img/gmap/militar/castell/castell3.png b/img/gmap/militar/castell/castell3.png
diff --git a/img/gmap/militar/castell/castell4.png b/img/gmap/militar/castell/castell4.png
diff --git a/img/gmap/militar/castell/castell5.png b/img/gmap/militar/castell/castell5.png
diff --git a/img/gmap/militar/castell/castell6.png b/img/gmap/militar/castell/castell6.png
diff --git a/img/gmap/militar/castell/castell7.png b/img/gmap/militar/castell/castell7.png
diff --git a/img/gmap/militar/castell/castell8.png b/img/gmap/militar/castell/castell8.png
diff --git a/img/gmap/militar/epocaCarlina/epocaCarlina1.png b/img/gmap/militar/epocaCarlina/epocaCarlina1.png
diff --git a/img/gmap/militar/epocaCarlina/epocaCarlina2.png b/img/gmap/militar/epocaCarlina/epocaCarlina2.png
diff --git a/img/gmap/militar/epocaCarlina/epocaCarlina3.png b/img/gmap/militar/epocaCarlina/epocaCarlina3.png
diff --git a/img/gmap/militar/epocaCarlina/epocaCarlina4.png b/img/gmap/militar/epocaCarlina/epocaCarlina4.png
diff --git a/img/gmap/militar/epocaCarlina/epocaCarlina5.png b/img/gmap/militar/epocaCarlina/epocaCarlina5.png
diff --git a/img/gmap/militar/epocaCarlina/epocaCarlina6.png b/img/gmap/militar/epocaCarlina/epocaCarlina6.png
diff --git a/img/gmap/militar/epocaCarlina/epocaCarlina7.png b/img/gmap/militar/epocaCarlina/epocaCarlina7.png
diff --git a/img/gmap/militar/epocaCarlina/epocaCarlina8.png b/img/gmap/militar/epocaCarlina/epocaCarlina8.png
diff --git a/img/gmap/militar/muralles/muralles1.png b/img/gmap/militar/muralles/muralles1.png
diff --git a/img/gmap/militar/muralles/muralles2.png b/img/gmap/militar/muralles/muralles2.png
diff --git a/img/gmap/militar/muralles/muralles3.png b/img/gmap/militar/muralles/muralles3.png
diff --git a/img/gmap/militar/muralles/muralles4.png b/img/gmap/militar/muralles/muralles4.png
diff --git a/img/gmap/militar/muralles/muralles5.png b/img/gmap/militar/muralles/muralles5.png
diff --git a/img/gmap/militar/muralles/muralles6.png b/img/gmap/militar/muralles/muralles6.png
diff --git a/img/gmap/militar/muralles/muralles7.png b/img/gmap/militar/muralles/muralles7.png
diff --git a/img/gmap/militar/muralles/muralles8.png b/img/gmap/militar/muralles/muralles8.png
diff --git a/img/gmap/militar/torre/torre1.png b/img/gmap/militar/torre/torre1.png
diff --git a/img/gmap/militar/torre/torre2.png b/img/gmap/militar/torre/torre2.png
diff --git a/img/gmap/militar/torre/torre3.png b/img/gmap/militar/torre/torre3.png
diff --git a/img/gmap/militar/torre/torre4.png b/img/gmap/militar/torre/torre4.png
diff --git a/img/gmap/militar/torre/torre5.png b/img/gmap/militar/torre/torre5.png
diff --git a/img/gmap/militar/torre/torre6.png b/img/gmap/militar/torre/torre6.png
diff --git a/img/gmap/militar/torre/torre7.png b/img/gmap/militar/torre/torre7.png
diff --git a/img/gmap/militar/torre/torre8.png b/img/gmap/militar/torre/torre8.png
diff --git a/img/gmap/religios/basilicaCatedral/basilicaCatedral1.png b/img/gmap/religios/basilicaCatedral/basilicaCatedral1.png
diff --git a/img/gmap/religios/basilicaCatedral/basilicaCatedral2.png b/img/gmap/religios/basilicaCatedral/basilicaCatedral2.png
diff --git a/img/gmap/religios/basilicaCatedral/basilicaCatedral3.png b/img/gmap/religios/basilicaCatedral/basilicaCatedral3.png
diff --git a/img/gmap/religios/basilicaCatedral/basilicaCatedral4.png b/img/gmap/religios/basilicaCatedral/basilicaCatedral4.png
diff --git a/img/gmap/religios/basilicaCatedral/basilicaCatedral5.png b/img/gmap/religios/basilicaCatedral/basilicaCatedral5.png
diff --git a/img/gmap/religios/basilicaCatedral/basilicaCatedral6.png b/img/gmap/religios/basilicaCatedral/basilicaCatedral6.png
diff --git a/img/gmap/religios/basilicaCatedral/basilicaCatedral7.png b/img/gmap/religios/basilicaCatedral/basilicaCatedral7.png
diff --git a/img/gmap/religios/basilicaCatedral/basilicaCatedral8.png b/img/gmap/religios/basilicaCatedral/basilicaCatedral8.png
diff --git a/img/gmap/religios/ermitaCapella/ermitaCapella1.png b/img/gmap/religios/ermitaCapella/ermitaCapella1.png
diff --git a/img/gmap/religios/ermitaCapella/ermitaCapella2.png b/img/gmap/religios/ermitaCapella/ermitaCapella2.png
diff --git a/img/gmap/religios/ermitaCapella/ermitaCapella3.png b/img/gmap/religios/ermitaCapella/ermitaCapella3.png
diff --git a/img/gmap/religios/ermitaCapella/ermitaCapella4.png b/img/gmap/religios/ermitaCapella/ermitaCapella4.png
diff --git a/img/gmap/religios/ermitaCapella/ermitaCapella5.png b/img/gmap/religios/ermitaCapella/ermitaCapella5.png
diff --git a/img/gmap/religios/ermitaCapella/ermitaCapella6.png b/img/gmap/religios/ermitaCapella/ermitaCapella6.png
diff --git a/img/gmap/religios/ermitaCapella/ermitaCapella7.png b/img/gmap/religios/ermitaCapella/ermitaCapella7.png
diff --git a/img/gmap/religios/ermitaCapella/ermitaCapella8.png b/img/gmap/religios/ermitaCapella/ermitaCapella8.png
diff --git a/img/gmap/religios/esglesia/esglesia1.png b/img/gmap/religios/esglesia/esglesia1.png
diff --git a/img/gmap/religios/esglesia/esglesia2.png b/img/gmap/religios/esglesia/esglesia2.png
diff --git a/img/gmap/religios/esglesia/esglesia3.png b/img/gmap/religios/esglesia/esglesia3.png
diff --git a/img/gmap/religios/esglesia/esglesia4.png b/img/gmap/religios/esglesia/esglesia4.png
diff --git a/img/gmap/religios/esglesia/esglesia5.png b/img/gmap/religios/esglesia/esglesia5.png
diff --git a/img/gmap/religios/esglesia/esglesia6.png b/img/gmap/religios/esglesia/esglesia6.png
diff --git a/img/gmap/religios/esglesia/esglesia7.png b/img/gmap/religios/esglesia/esglesia7.png
diff --git a/img/gmap/religios/esglesia/esglesia8.png b/img/gmap/religios/esglesia/esglesia8.png
diff --git a/img/gmap/religios/monestir/monestir1.png b/img/gmap/religios/monestir/monestir1.png
diff --git a/img/gmap/religios/monestir/monestir2.png b/img/gmap/religios/monestir/monestir2.png
diff --git a/img/gmap/religios/monestir/monestir3.png b/img/gmap/religios/monestir/monestir3.png
diff --git a/img/gmap/religios/monestir/monestir4.png b/img/gmap/religios/monestir/monestir4.png
diff --git a/img/gmap/religios/monestir/monestir5.png b/img/gmap/religios/monestir/monestir5.png
diff --git a/img/gmap/religios/monestir/monestir6.png b/img/gmap/religios/monestir/monestir6.png
diff --git a/img/gmap/religios/monestir/monestir7.png b/img/gmap/religios/monestir/monestir7.png
diff --git a/img/gmap/religios/monestir/monestir8.png b/img/gmap/religios/monestir/monestir8.png
diff --git a/img/gmap/view_fullscreen.png b/img/gmap/view_fullscreen.png
diff --git a/img/heart30.png b/img/heart30.png
diff --git a/img/heart40.png b/img/heart40.png
diff --git a/img/heart50.png b/img/heart50.png
diff --git a/img/m1.png b/img/m1.png
diff --git a/img/m2.png b/img/m2.png
diff --git a/img/m3.png b/img/m3.png
diff --git a/img/m4.png b/img/m4.png
diff --git a/img/m5.png b/img/m5.png
diff --git a/img/people35.png b/img/people35.png
diff --git a/img/people45.png b/img/people45.png
diff --git a/img/people55.png b/img/people55.png
diff --git a/index.html b/index.html
@@ -1,61 +1,68 @@
 <html>
-<head>
-	<title>Interactive Map of Catalunya using GoogleMaps API - Demo V2.0</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="description" content="GoogleMaps gMap Catalunya Map">
-	<meta name="author" content="Enric Ballo">
-
-	<link rel="stylesheet" type="text/css" href="css/main.css">
-	<link rel="stylesheet" type="text/css" href="css/catalunya-gmap.css">
-
-</head>
-<body>
-
-	<h1>Interactive Map of Catalunya using GoogleMaps API - Demo V2.0</h1>
-	<h4> :: Catalunya Medieval Project - <a href="http://www.catalunyamedieval.es/" target="_blank" title="Catalunya Medieval">www.catalunyamedieval.es</a> ::</h4>
-
-	<a href="https://github.com/eballo/catalunya-gmap"><img style="position: absolute; top: 0; right: 0; border: 0;" src="img/forkme_right_darkblue.png" alt="Fork me on GitHub"></a>
-
-	<div id="container">
-
-		<div id="mapContainer">
-			<div id="gMap"></div>
-		</div>
-		<script type="text/javascript" src="https://maps.google.com/maps/api/js?sensor=false"></script>
-		<script type="text/javascript" src="js/castells.js" ></script>
-		<script type="text/javascript" src="js/markercluster_min.js" ></script>
+    <head>
+        <title>Interactive Map of Catalunya using GoogleMaps API</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+        <meta name="description" content="GoogleMaps gMap Catalunya Map">
+        <meta name="author" content="Enric Ballo">
+
+        <link rel="stylesheet" type="text/css" href="css/main.css">
+        <link rel="stylesheet" type="text/css" href="css/catalunya-gmap.css">
+
+    </head>
+    <body>
+
+        <h1 id="title-h1">Interactive Map of Catalunya using GoogleMaps API - Demo V3.0</h1>
+        <h4 id="title-h4"> :: Catalunya Medieval Project - <a href="http://www.catalunyamedieval.es/" target="_blank" title="Catalunya Medieval">www.catalunyamedieval.es</a> ::</h4>
+
+        <a href="https://github.com/eballo/catalunya-gmap"><img style="position: absolute; top: 0; right: 0; border: 0;" src="img/forkme_right_darkblue.png" alt="Fork me on GitHub"></a>
+
+        <button id="fullScreen" type="button">FullScreen</button>
+
+        <div id="container">
+
+            <div id="mapContainer">
+                <div id="gMap"></div>
+            </div>
+
+            <div id="info">
+                <table class="description" cellspacing="10" cellpadding="10">
+                <tbody>
+                    <tr>
+                        <td>
+                            <strong>CAT</strong> 
+                            <p>Mapa interactiu de Catalunya fent ús de la llibreria GoogleMaps</p>
+                        </td>
+                        <td>
+                            <strong>EN</strong>
+                            <p>Interactive map of Catalonia based GoogleMaps library</p>
+                        </td>
+                        <td>
+                            <strong>ES</strong>
+                            <p>Mapa interactivo de Cataluña usando la libreria GoogleMaps</p>
+                        </td>
+                        <td>
+                            <strong>NL</strong>
+                            <p>Interactieve kaart van Catalonië op basis van GoogleMaps bibliotheek</p>
+                        </td>
+                    </tr>
+                </tbody>
+                </table>
+            </div>
+
+
+        </div>
+
+    </body>
+    <footer>
+        <script type="text/javascript" src="https://maps.google.com/maps/api/js?key=AIzaSyCEHyRrPrjtOb-gleixt6yvCAhJRgPOb4w"></script>
+		<script type="text/javascript" src="js/jquery-3.1.1.min.js" ></script>
+        <script type="text/javascript" src="js/catalunya-gmap-path.js" ></script>
+		<script type="text/javascript" src="js/markerclusterer.js" ></script>
 		<script type="text/javascript" src="js/catalunya-list.js" ></script>
 		<script type="text/javascript" src="js/catalunya-catmap.js" ></script>
 		<script type="text/javascript" src="js/catalunya-options-gmap.js" ></script>
+		<script type="text/javascript" src="js/catalunya-edifici.js" ></script>
 		<script type="text/javascript" src="js/catalunya-gmap.js" ></script>
-
-		<div id="info">
-			<table class="description" cellspacing="10" cellpadding="10">
-			<tbody>
-				<tr>
-					<td>
-						<strong>CAT</strong> 
-						<p>Mapa interactiu de Catalunya fent ús de la llibreria GoogleMaps</p>
-					</td>
-					<td>
-						<strong>EN</strong>
-						<p>Interactive map of Catalonia based GoogleMaps library</p>
-					</td>
-					<td>
-						<strong>ES</strong>
-						<p>Mapa interactivo de Cataluña usando la libreria GoogleMaps</p>
-					</td>
-					<td>
-						<strong>NL</strong>
-						<p>Interactieve kaart van Catalonië op basis van GoogleMaps bibliotheek</p>
-					</td>
-				</tr>
-			</tbody>
-			</table>
-		</div>
-
-
-	</div>
-
-</body>
+
+    </footer>
 </html>
diff --git a/js/castells.js b/js/castells.js