Commit a0cf2ece8ac386e79da9f598dbedb860c5ab4a35

Authored by Diego Gonzalez
1 parent 1be3576921
Exists in master

Arreglo en impresion de mapas

Showing 8 changed files with 280 additions and 113 deletions Side-by-side Diff

web/css/geopostal.css View file @ a0cf2ec
... ... @@ -12,7 +12,7 @@
12 12  
13 13 @font-face {
14 14 font-family: 'yanone_kaffeesatzbold';
15   - src: url('fonts/Yanone/YanoneKaffeesatz-Bold-webfont.eot');
  15 + src: url('fonts/Yanone/YanoneKaffeesatz-Bold-webfont.');
16 16 src: url('fonts/Yanone/YanoneKaffeesatz-Bold-webfont.eot?#iefix') format('embedded-opentype'),
17 17 url('fonts/Yanone/YanoneKaffeesatz-Bold-webfont.woff2') format('woff2'),
18 18 url('fonts/Yanone/YanoneKaffeesatz-Bold-webfont.woff') format('woff'),
19 19  
... ... @@ -156,18 +156,26 @@
156 156 #loader {
157 157 z-index: 1000000;
158 158 opacity: 0;
159   - width: 100px;
160   - height: 50px;
161   - position: absolute;
162   - left: 50%;
163   - top: -50%;
164   - margin-left: -50px;
165   - margin-top: -25px;
166   - background-color: #CACACA;
  159 + width: 152px;
  160 + height: 55px;
  161 + position: absolute;
  162 + left: 50%;
  163 + top: -50%;
  164 + margin-left: -76px;
  165 + margin-top: -25px;
  166 + background-color: #FFFFFF;
167 167 -webkit-transition: all 0.5s ease;
168 168 -moz-transition: all 0.5s ease;
169 169 -o-transition: all 0.5s ease;
170 170 transition: all 0.5s ease;
  171 + padding: 13px;
  172 + border: 1px solid #797979;
  173 + -webkit-border-radius: 3px;
  174 + -moz-border-radius: 3px;
  175 + -moz-border-radius: 3px;
  176 + -webkit-box-shadow: 1px 1px 5px 1px rgba(98, 98, 98, 1);
  177 + -moz-box-shadow: 1px 1px 5px 1px rgba(98, 98, 98, 1);
  178 + box-shadow: 1px 1px 5px 1px rgba(98, 98, 98, 1);
171 179 }
172 180  
173 181 #loader.active {
... ... @@ -343,7 +351,7 @@
343 351 #isisPanelcontacto > div.accordeon-title{
344 352 background-image: url('images/icons/burbuja.png');
345 353 background-position: 12px 12px;
346   -
  354 +
347 355 }
348 356  
349 357  
350 358  
351 359  
... ... @@ -517,15 +525,15 @@
517 525 -moz-border-radius: 0px;
518 526 border-radius: 0px;
519 527 background-color: rgba(255, 255, 255, 0.5);
520   - top: 89px;
  528 + top: 87px;
521 529 left: 27px;
522 530 border-left: 1px solid #c2c2c2;
523 531 border-right: 1px solid #c2c2c2;
524   - width: 20px;
  532 + width: 18px;
525 533 }
526 534  
527 535 .ol-zoomslider-thumb {
528   - margin-left: -2px;
  536 + margin-left: -3px;
529 537 background-color: rgba(255, 255, 255, 1);
530 538 color: #4D4D4D;
531 539 border: 1px solid #c2c2c2;
... ... @@ -1194,5 +1202,97 @@
1194 1202  
1195 1203 legend {
1196 1204 border: none !important
  1205 +}
  1206 +
  1207 +#imprimir-rotacion {
  1208 + border: 1px solid #d3d3d3;
  1209 + background: #e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x;
  1210 + font-weight: normal;
  1211 + color: #555555;
  1212 +}
  1213 +
  1214 +
  1215 +.geopostal-select {
  1216 + border: 1px solid rgb(184, 184, 184);
  1217 + margin-bottom: 10px;
  1218 + padding: 3px;
  1219 + width: 228px !important;
  1220 +}
  1221 +
  1222 +
  1223 +
  1224 +
  1225 +
  1226 +
  1227 +.spinner {
  1228 + width: 30px;
  1229 + height: 30px;
  1230 + position: relative;
  1231 + /*margin: 100px auto;*/
  1232 +}
  1233 +
  1234 +.doublebounce1, .doublebounce2 {
  1235 + width: 100%;
  1236 + height: 100%;
  1237 + border-radius: 50%;
  1238 + background-color: #018FD0;
  1239 + opacity: 0.6;
  1240 + position: absolute;
  1241 + top: 0;
  1242 + left: 0;
  1243 +
  1244 + -webkit-animation: bounce 2.0s infinite ease-in-out;
  1245 + animation: bounce 2.0s infinite ease-in-out;
  1246 +}
  1247 +
  1248 +.doublebounce2 {
  1249 + -webkit-animation-delay: -1.0s;
  1250 + animation-delay: -1.0s;
  1251 +}
  1252 +
  1253 +@-webkit-keyframes bounce {
  1254 + 0%, 100% { -webkit-transform: scale(0.0) }
  1255 +50% { -webkit-transform: scale(1.0) }
  1256 +}
  1257 +
  1258 +@keyframes bounce {
  1259 + 0%, 100% {
  1260 + transform: scale(0.0);
  1261 + -webkit-transform: scale(0.0);
  1262 +} 50% {
  1263 + transform: scale(1.0);
  1264 + -webkit-transform: scale(1.0);
  1265 +}
  1266 +}
  1267 +
  1268 +#loader .spinner{
  1269 + float: left;
  1270 +}
  1271 +
  1272 +
  1273 +.modalScreen{
  1274 + width: 0%;
  1275 + height: 100%;
  1276 + top: 0%;
  1277 + left: 0;
  1278 + background-color: #000;
  1279 + position: absolute;
  1280 + z-index: 150;
  1281 + display: block;
  1282 + opacity: 0;
  1283 + -webkit-transition: opacity 1.0s ease;
  1284 + -moz-transition: opacity 1.0s ease;
  1285 + -o-transition: opacity 1.0s ease;
  1286 + transition: opacity 1.0s ease;
  1287 + /* -webkit-transition: width 0s ease;
  1288 + -moz-transition: width 0s ease;
  1289 + -o-transition: width 0s ease;
  1290 + transition: width 0s ease;*/
  1291 +
  1292 +}
  1293 +
  1294 +.modalScreen.active{
  1295 + width: 100%;
  1296 + opacity: 0.5;
1197 1297 }
web/css/images/correo_pin.png View file @ a0cf2ec

17.2 KB | W: | H:

17.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
web/index.jsp View file @ a0cf2ec
... ... @@ -16,8 +16,8 @@
16 16 <title>Geopostal</title>
17 17  
18 18 <script type="text/javascript" src="js/libs/pace.js<%=version%>"></script>
19   -
20 19  
  20 +
21 21 <link rel="stylesheet" href="js/libs/pace.css" type="text/css">
22 22 <!-- Bootstrap -->
23 23 <link href="js/bootstrap-3.3.4/css/bootstrap.min.css" rel="stylesheet">
24 24  
... ... @@ -85,8 +85,15 @@
85 85 </div>
86 86 </div>
87 87  
  88 + <div class="modalScreen" > </div>
88 89 <div id="loader" >
89   - LOADING...
  90 + <div class="spinner">
  91 + <div class="doublebounce1"></div>
  92 + <div class="doublebounce2"></div>
  93 + </div>
  94 + <div style="float:left; margin-left: 16px; margin-top: 5px;">
  95 + Cargando...
  96 + </div>
90 97 </div>
91 98  
92 99 <div id="resJson" style="display: none"></div>
web/js/isis/IsisExt.js View file @ a0cf2ec
... ... @@ -36,7 +36,8 @@
36 36  
37 37 mostrarLoader: function(mensaje) {
38 38 if(!this.mostrandoLoader){
39   - $("#loader").toggleClass("active");
  39 + $("#loader").addClass("active");
  40 + $(".modalScreen").addClass("active");
40 41 this.mostrandoLoader = true;
41 42 }
42 43 },
... ... @@ -45,7 +46,8 @@
45 46 */
46 47 ocultarLoader: function() {
47 48 if (this.mostrandoLoader){
48   - $("#loader").toggleClass("active");
  49 + $("#loader").removeClass("active");
  50 + $(".modalScreen").removeClass("active");
49 51 this.mostrandoLoader = false;
50 52 }
51 53  
web/js/isis/IsisMapa.js View file @ a0cf2ec
... ... @@ -65,7 +65,8 @@
65 65 var view = new ol.View({
66 66 resolutions: this.getResolutions(),
67 67 resolution: 1763.8924166737224,
68   - center: ol.proj.transform([-6230946.505053505, -3874239.541910441], 'EPSG:900913', 'EPSG:900913'),
  68 + // center: ol.proj.transform([-6230946.505053505, -3874239.541910441], 'EPSG:900913', 'EPSG:900913'),
  69 + center: ol.proj.transform([-6011477.407389778, -3872497.30722128], 'EPSG:900913', 'EPSG:900913'),
69 70 zoom: 4
70 71 });
71 72  
... ... @@ -466,6 +467,33 @@
466 467 });
467 468 }
468 469 });
  470 +
  471 +
  472 + //Cambio de estilo del zoom box
  473 + var interactions = this.map.getInteractions().getArray();
  474 + for (var i = 0; i < interactions.length; i++){
  475 + var interaction = interactions[i];
  476 + if (ol.interaction.DragZoom.prototype.isPrototypeOf(interaction)){
  477 + interaction.setProperties({
  478 + style: new ol.style.Style({
  479 + fill: new ol.style.Fill({
  480 + color: 'rgba(1, 143, 208, 0.2)'
  481 + }),
  482 + stroke: new ol.style.Stroke({
  483 + color: '#018FD0',
  484 + width: 2
  485 + }),
  486 + image: new ol.style.Circle({
  487 + radius: 7,
  488 + fill: new ol.style.Fill({
  489 + color: '#ffcc33'
  490 + })
  491 + })
  492 + })
  493 + });
  494 + }
  495 + }
  496 + // IsisSesion.getIsisMapa().getMap().getInteractions().getArray()[8].getProperties()
469 497  
470 498  
471 499  
web/js/isis/IsisPanel.js View file @ a0cf2ec
... ... @@ -32,6 +32,7 @@
32 32 this.htmlContent = "";
33 33 }
34 34 this.onExpandCallback = null;
  35 + this.onCollapseCallback = null;
35 36 this.doLayout();
36 37 }
37 38  
38 39  
39 40  
40 41  
41 42  
... ... @@ -86,28 +87,43 @@
86 87 this.onExpandCallback();
87 88 }
88 89 $('#isisPanel' + this.id + ".accordeon-item").addClass("open-item");
89   - setTimeout(function(){ $('#sidebar-content').getNiceScroll().resize(); }, 650);
  90 + setTimeout(function(){
  91 + $('#sidebar-content').getNiceScroll().resize();
  92 + }, 650);
90 93 },
91 94 collapse : function (){
92 95 $('#isisPanel' + this.id + ".accordeon-item > .accordeon-content ").hide();
93 96 $('#isisPanel' + this.id + ".accordeon-item").removeClass("open-item");
94   -
95   - setTimeout(function(){ $('#sidebar-content').getNiceScroll().resize(); }, 650);
  97 + if (this.onCollapseCallback != null){
  98 + this.onCollapseCallback();
  99 + }
  100 + setTimeout(function(){
  101 + $('#sidebar-content').getNiceScroll().resize();
  102 + }, 650);
96 103 },
97 104 toogle : function (){
98 105 if ( $('#isisPanel' + this.id + ".accordeon-item > .accordeon-content ").is(":hidden")){
99 106 if (this.onExpandCallback != null){
100 107 this.onExpandCallback();
101 108 }
  109 + }else{
  110 + if (this.onCollapseCallback != null){
  111 + this.onCollapseCallback();
  112 + }
102 113 }
103 114 $('#isisPanel' + this.id + ".accordeon-item > .accordeon-content ").slideToggle("blind");
104 115 $('#isisPanel' + this.id + ".accordeon-item").toggleClass("open-item");
105   - setTimeout(function(){ $('#sidebar-content').getNiceScroll().resize(); }, 650);
  116 + setTimeout(function(){
  117 + $('#sidebar-content').getNiceScroll().resize();
  118 + }, 650);
106 119  
107 120  
108 121 },
109 122 onExpand : function (callback){
110 123 this.onExpandCallback = callback;
  124 + },
  125 + onCollapse: function (callback){
  126 + this.onCollapseCallback = callback;
111 127 },
112 128 replaceContent : function (htmlContent){
113 129 $('#isisPanel' + this.id + ".accordeon-item > .accordeon-content ").html(htmlContent);
web/js/isis/IsisResultado.js View file @ a0cf2ec
... ... @@ -172,10 +172,10 @@
172 172 // polygonFeature.getGeometry().transform('EPSG:4326', IsisSesion.getIsisMapa().getMap().getView().getProjection());
173 173 polygonFeature.setStyle(new ol.style.Style({
174 174 fill: new ol.style.Fill({
175   - color: 'rgba(255, 255, 255, 0.9)'
  175 + color: 'rgba(1, 143, 208, 0.2)'
176 176 }),
177 177 stroke: new ol.style.Stroke({
178   - color: '#ffcc33',
  178 + color: '#018FD0',
179 179 width: 2
180 180 }),
181 181 image: new ol.style.Circle({
web/js/isis/IsisUtils.js View file @ a0cf2ec
... ... @@ -44,13 +44,26 @@
44 44 return normScale;
45 45 };
46 46  
  47 +IsisUtils.getScaleFromResolution = function (resolution) {
  48 + var scale;
  49 + if (resolution) {
  50 + scale = 1 / (resolution * 39.37 *72);
  51 + if(scale < 1){
  52 + scale = 1/scale;
  53 + }
  54 + }
  55 + return scale;
  56 +};
47 57  
  58 +
  59 +
48 60 IsisUtils.getResolutionFromScale = function (scale) {
49 61 var resolution;
50 62 if (scale) {
51 63  
52 64 var normScale = IsisUtils.normalizeScale(scale);
53 65 resolution = 1 / (normScale * 39.37 *72);
  66 +
54 67 }
55 68 return resolution;
56 69 };
... ... @@ -210,7 +223,7 @@
210 223 }
211 224 }).fail(function(){
212 225  
213   - }).done(function (msg){
  226 + }).done(function (msg){
214 227 callback(msg);
215 228 });
216 229  
... ... @@ -232,8 +245,8 @@
232 245 init: function () {
233 246 this.browser = this.searchString(this.dataBrowser) || "An unknown browser";
234 247 this.version = this.searchVersion(navigator.userAgent)
235   - || this.searchVersion(navigator.appVersion)
236   - || "an unknown version";
  248 + || this.searchVersion(navigator.appVersion)
  249 + || "an unknown version";
237 250 this.OS = this.searchString(this.dataOS) || "an unknown OS";
238 251 },
239 252 searchString: function (data) {
240 253  
... ... @@ -255,93 +268,93 @@
255 268 return parseFloat(dataString.substring(index+this.versionSearchString.length+1));
256 269 },
257 270 dataBrowser: [
258   - {
259   - string: navigator.userAgent,
260   - subString: "Chrome",
261   - identity: "Chrome"
262   - },
263   - {
264   - string: navigator.userAgent,
265   - subString: "OmniWeb",
266   - versionSearch: "OmniWeb/",
267   - identity: "OmniWeb"
268   - },
269   - {
270   - string: navigator.vendor,
271   - subString: "Apple",
272   - identity: "Safari",
273   - versionSearch: "Version"
274   - },
275   - {
276   - prop: window.opera,
277   - identity: "Opera",
278   - versionSearch: "Version"
279   - },
280   - {
281   - string: navigator.vendor,
282   - subString: "iCab",
283   - identity: "iCab"
284   - },
285   - {
286   - string: navigator.vendor,
287   - subString: "KDE",
288   - identity: "Konqueror"
289   - },
290   - {
291   - string: navigator.userAgent,
292   - subString: "Firefox",
293   - identity: "Firefox"
294   - },
295   - {
296   - string: navigator.vendor,
297   - subString: "Camino",
298   - identity: "Camino"
299   - },
300   - { // for newer Netscapes (6+)
301   - string: navigator.userAgent,
302   - subString: "Netscape",
303   - identity: "Netscape"
304   - },
305   - {
306   - string: navigator.userAgent,
307   - subString: "MSIE",
308   - identity: "Explorer",
309   - versionSearch: "MSIE"
310   - },
311   - {
312   - string: navigator.userAgent,
313   - subString: "Gecko",
314   - identity: "Mozilla",
315   - versionSearch: "rv"
316   - },
317   - { // for older Netscapes (4-)
318   - string: navigator.userAgent,
319   - subString: "Mozilla",
320   - identity: "Netscape",
321   - versionSearch: "Mozilla"
322   - }
  271 + {
  272 + string: navigator.userAgent,
  273 + subString: "Chrome",
  274 + identity: "Chrome"
  275 + },
  276 + {
  277 + string: navigator.userAgent,
  278 + subString: "OmniWeb",
  279 + versionSearch: "OmniWeb/",
  280 + identity: "OmniWeb"
  281 + },
  282 + {
  283 + string: navigator.vendor,
  284 + subString: "Apple",
  285 + identity: "Safari",
  286 + versionSearch: "Version"
  287 + },
  288 + {
  289 + prop: window.opera,
  290 + identity: "Opera",
  291 + versionSearch: "Version"
  292 + },
  293 + {
  294 + string: navigator.vendor,
  295 + subString: "iCab",
  296 + identity: "iCab"
  297 + },
  298 + {
  299 + string: navigator.vendor,
  300 + subString: "KDE",
  301 + identity: "Konqueror"
  302 + },
  303 + {
  304 + string: navigator.userAgent,
  305 + subString: "Firefox",
  306 + identity: "Firefox"
  307 + },
  308 + {
  309 + string: navigator.vendor,
  310 + subString: "Camino",
  311 + identity: "Camino"
  312 + },
  313 + { // for newer Netscapes (6+)
  314 + string: navigator.userAgent,
  315 + subString: "Netscape",
  316 + identity: "Netscape"
  317 + },
  318 + {
  319 + string: navigator.userAgent,
  320 + subString: "MSIE",
  321 + identity: "Explorer",
  322 + versionSearch: "MSIE"
  323 + },
  324 + {
  325 + string: navigator.userAgent,
  326 + subString: "Gecko",
  327 + identity: "Mozilla",
  328 + versionSearch: "rv"
  329 + },
  330 + { // for older Netscapes (4-)
  331 + string: navigator.userAgent,
  332 + subString: "Mozilla",
  333 + identity: "Netscape",
  334 + versionSearch: "Mozilla"
  335 + }
323 336 ],
324 337 dataOS : [
325   - {
326   - string: navigator.platform,
327   - subString: "Win",
328   - identity: "Windows"
329   - },
330   - {
331   - string: navigator.platform,
332   - subString: "Mac",
333   - identity: "Mac"
334   - },
335   - {
336   - string: navigator.userAgent,
337   - subString: "iPhone",
338   - identity: "iPhone/iPod"
339   - },
340   - {
341   - string: navigator.platform,
342   - subString: "Linux",
343   - identity: "Linux"
344   - }
  338 + {
  339 + string: navigator.platform,
  340 + subString: "Win",
  341 + identity: "Windows"
  342 + },
  343 + {
  344 + string: navigator.platform,
  345 + subString: "Mac",
  346 + identity: "Mac"
  347 + },
  348 + {
  349 + string: navigator.userAgent,
  350 + subString: "iPhone",
  351 + identity: "iPhone/iPod"
  352 + },
  353 + {
  354 + string: navigator.platform,
  355 + subString: "Linux",
  356 + identity: "Linux"
  357 + }
345 358 ]
346 359  
347 360 };