Commit 9ce0ede801c46198cff7cd127c3fb8f24e776562
1 parent
69ceff44
Exists in
master
and in
7 other branches
Compatibilização da lista de símbolos lineares presentes no arquivo simbolos.sym e simboloslin.sym
Showing
4 changed files
with
354 additions
and
41 deletions
Show diff stats
classesphp/classe_legenda.php
@@ -507,6 +507,7 @@ $size - Tamanho que será aplicado ao símbolo. | @@ -507,6 +507,7 @@ $size - Tamanho que será aplicado ao símbolo. | ||
507 | $sld = $this->layer->getmetadata("sld"); | 507 | $sld = $this->layer->getmetadata("sld"); |
508 | reSLD($this->arquivo,$this->nome,$sld); | 508 | reSLD($this->arquivo,$this->nome,$sld); |
509 | } | 509 | } |
510 | + return "ok"; | ||
510 | } | 511 | } |
511 | /* | 512 | /* |
512 | function: pegaParametrosLegImg | 513 | function: pegaParametrosLegImg |
classesphp/mapa_controle.php
@@ -1601,16 +1601,30 @@ Include: | @@ -1601,16 +1601,30 @@ Include: | ||
1601 | include("classe_legenda.php"); | 1601 | include("classe_legenda.php"); |
1602 | $m = new Legenda($map_file,$locaplic,$tema); | 1602 | $m = new Legenda($map_file,$locaplic,$tema); |
1603 | if ($opcao == "excluiestilo") | 1603 | if ($opcao == "excluiestilo") |
1604 | - {$cp->set_data($m->excluiEstilo($classe,$estilo));} | 1604 | + { |
1605 | + $cp->set_data($m->excluiEstilo($classe,$estilo)); | ||
1606 | + $m->salva(); | ||
1607 | + } | ||
1605 | if ($opcao == "adicionaestilo") | 1608 | if ($opcao == "adicionaestilo") |
1606 | - {$cp->set_data($m->adicionaEstilo($classe,$estilo));} | 1609 | + { |
1610 | + $cp->set_data($m->adicionaEstilo($classe,$estilo)); | ||
1611 | + $m->salva(); | ||
1612 | + } | ||
1607 | if ($opcao == "sobeestilo") | 1613 | if ($opcao == "sobeestilo") |
1608 | - {$cp->set_data($m->sobeEstilo ($classe,$estilo));} | 1614 | + { |
1615 | + $cp->set_data($m->sobeEstilo ($classe,$estilo)); | ||
1616 | + $m->salva(); | ||
1617 | + } | ||
1609 | if ($opcao == "desceestilo") | 1618 | if ($opcao == "desceestilo") |
1610 | - {$cp->set_data($m->desceEstilo ($classe,$estilo));} | 1619 | + { |
1620 | + $cp->set_data($m->desceEstilo ($classe,$estilo)); | ||
1621 | + $m->salva(); | ||
1622 | + } | ||
1611 | if ($opcao == "aplica") | 1623 | if ($opcao == "aplica") |
1612 | - {$cp->set_data($m->aplicaParametro($classe,$estilo,$outlinecolor,$backgroundcolor,$color,$symbolname,$size));} | ||
1613 | - $m->salva(); | 1624 | + { |
1625 | + $cp->set_data($m->aplicaParametro($classe,$estilo,$outlinecolor,$backgroundcolor,$color,$symbolname,$size)); | ||
1626 | + $m->salva(); | ||
1627 | + } | ||
1614 | if ($opcao == "listaSimbolos") | 1628 | if ($opcao == "listaSimbolos") |
1615 | {$cp->set_data($m->listaSimbolos($tipo,$dir_tmp,$imgdir));} | 1629 | {$cp->set_data($m->listaSimbolos($tipo,$dir_tmp,$imgdir));} |
1616 | if ($opcao == "pegaparametros") | 1630 | if ($opcao == "pegaparametros") |
symbols/simbolos.sym
@@ -518,14 +518,315 @@ Symbol | @@ -518,14 +518,315 @@ Symbol | ||
518 | 1 1 | 518 | 1 1 |
519 | END | 519 | END |
520 | END | 520 | END |
521 | -SYMBOL | ||
522 | -NAME "T" | ||
523 | -TYPE TRUETYPE | ||
524 | -FONT "arial" | ||
525 | -CHARACTER "#" | ||
526 | -ANTIALIAS TRUE | ||
527 | -GAP 10 | 521 | + Symbol |
522 | + Name "pt1l" | ||
523 | + Type VECTOR | ||
524 | + TRANSPARENT 0 | ||
525 | + Points | ||
526 | + 1 1 | ||
527 | + 1 1 | ||
528 | + END | ||
529 | + STYLE | ||
530 | + 1 13 1 13 | ||
531 | + END | ||
532 | + END | ||
533 | + | ||
534 | + Symbol | ||
535 | + name "pt2l" | ||
536 | + TYPE ELLIPSE | ||
537 | + POINTS 1 1 END | ||
538 | + FILLED true | ||
539 | + STYLE | ||
540 | + 1 13 1 13 | ||
541 | + END | ||
542 | + END | ||
543 | + | ||
544 | + Symbol | ||
545 | + Name "pt3l" | ||
546 | + Type ELLIPSE | ||
547 | + POINTS 1 1 END | ||
548 | + Transparent 0 | ||
549 | + STYLE | ||
550 | + 1 13 1 13 | ||
551 | + END | ||
552 | + END | ||
553 | + Symbol | ||
554 | + Name "setal" | ||
555 | + Type PIXMAP | ||
556 | + Image "seta.png" | ||
557 | + STYLE | ||
558 | + 1 13 1 13 | ||
559 | + END | ||
560 | + END | ||
561 | + | ||
562 | + Symbol | ||
563 | + Name "sedel" | ||
564 | + Type PIXMAP | ||
565 | + Image "sede.png" | ||
566 | + Transparent 1 | ||
567 | + STYLE | ||
568 | + 1 13 1 13 | ||
569 | + END | ||
570 | + | ||
571 | + END | ||
572 | + | ||
573 | + Symbol | ||
574 | + Name "cidmunl" | ||
575 | + Type PIXMAP | ||
576 | + Image "cidmun.png" | ||
577 | + STYLE | ||
578 | + 1 13 1 13 | ||
579 | + END | ||
580 | + | ||
581 | + END | ||
582 | + | ||
583 | + Symbol | ||
584 | + Name "capitall" | ||
585 | + Type PIXMAP | ||
586 | + Image "capital.png" | ||
587 | + STYLE | ||
588 | + 1 13 1 13 | ||
589 | + END | ||
590 | + | ||
591 | + END | ||
592 | + | ||
593 | + Symbol | ||
594 | + Name "cidadel" | ||
595 | + Type PIXMAP | ||
596 | + Image "cidade.png" | ||
597 | + STYLE | ||
598 | + 1 13 1 13 | ||
599 | + END | ||
600 | + | ||
601 | + END | ||
602 | + | ||
603 | + Symbol | ||
604 | + Name "vilal" | ||
605 | + Type PIXMAP | ||
606 | + Image "vila.png" | ||
607 | + STYLE | ||
608 | + 1 13 1 13 | ||
609 | + END | ||
610 | + | ||
611 | + END | ||
612 | + | ||
613 | + Symbol | ||
614 | + Name "xyl" | ||
615 | + Type PIXMAP | ||
616 | + Image "xy.png" | ||
617 | + STYLE | ||
618 | + 1 13 1 13 | ||
619 | + END | ||
620 | + | ||
621 | + END | ||
622 | + | ||
623 | + Symbol | ||
624 | + Name "xyrl" | ||
625 | + Type PIXMAP | ||
626 | + Image "xyr.png" | ||
627 | + STYLE | ||
628 | + 1 13 1 13 | ||
629 | + END | ||
630 | + | ||
631 | + END | ||
632 | + | ||
633 | + Symbol | ||
634 | + Name "portol" | ||
635 | + Type PIXMAP | ||
636 | + Image "porto.png" | ||
637 | + STYLE | ||
638 | + 1 13 1 13 | ||
639 | + END | ||
640 | + | ||
641 | + END | ||
642 | + | ||
643 | + Symbol | ||
644 | + Name "refl" | ||
645 | + Type PIXMAP | ||
646 | + Image "ref.png" | ||
647 | + STYLE | ||
648 | + 1 13 1 13 | ||
649 | + END | ||
650 | + | ||
651 | + END | ||
652 | + | ||
653 | + Symbol | ||
654 | + Name "marcal" | ||
655 | + Type PIXMAP | ||
656 | + Image "marca.png" | ||
657 | + STYLE | ||
658 | + 1 13 1 13 | ||
659 | + END | ||
660 | + | ||
661 | + END | ||
662 | + | ||
663 | + | ||
664 | + Symbol | ||
665 | + Name "pontol" | ||
666 | + Type ELLIPSE | ||
667 | + FILLED true | ||
668 | + TRANSPARENT 0 | ||
669 | + Points | ||
670 | + 1 1 | ||
671 | + 1 1 | ||
672 | + END | ||
673 | + STYLE | ||
674 | + 1 13 1 13 | ||
675 | + END | ||
676 | + | ||
677 | + END | ||
678 | + | ||
679 | + Symbol | ||
680 | + NAME 'quadradol' | ||
681 | + TYPE VECTOR | ||
682 | + FILLED TRUE | ||
683 | + POINTS | ||
684 | + 0 1 | ||
685 | + 0 0 | ||
686 | + 1 0 | ||
687 | + 1 1 | ||
688 | + 0 1 | ||
689 | + END | ||
690 | + STYLE | ||
691 | + 1 13 1 13 | ||
692 | + END | ||
693 | + | ||
694 | + END | ||
695 | + | ||
696 | + SYMBOL | ||
697 | + NAME "estrelal" | ||
698 | + TYPE vector | ||
699 | + FILLED TRUE | ||
700 | + POINTS | ||
701 | + 81 48 | ||
702 | + 66 0 | ||
703 | + 50 48 | ||
704 | + 0 48 | ||
705 | + 41 77 | ||
706 | + 25 125 | ||
707 | + 66 96 | ||
708 | + 106 125 | ||
709 | + 91 77 | ||
710 | + 131 48 | ||
711 | + 81 48 | ||
712 | + END | ||
713 | + STYLE | ||
714 | + 1 13 1 13 | ||
715 | + END | ||
716 | + | ||
717 | + END | ||
718 | + | ||
719 | + SYMBOL | ||
720 | + NAME 'triangulol' | ||
721 | + TYPE VECTOR | ||
722 | + FILLED TRUE | ||
723 | + POINTS | ||
724 | + 0 1 | ||
725 | + .5 0 | ||
726 | + 1 1 | ||
727 | + 0 1 | ||
728 | + END | ||
729 | + STYLE | ||
730 | + 1 13 1 13 | ||
731 | + END | ||
732 | + | ||
733 | + END | ||
734 | + | ||
735 | + SYMBOL | ||
736 | + NAME 'industrial' | ||
737 | + TYPE VECTOR | ||
738 | + FILLED TRUE | ||
739 | + POINTS | ||
740 | + 0 2 | ||
741 | + 0 5 | ||
742 | + 4 5 | ||
743 | + 4 0 | ||
744 | + 3 0 | ||
745 | + 3 2 | ||
746 | + 0 2 | ||
747 | + END | ||
748 | + STYLE | ||
749 | + 1 13 1 13 | ||
750 | + END | ||
751 | + | ||
752 | + END | ||
753 | + | ||
754 | + SYMBOL | ||
755 | + NAME 'torrel' | ||
756 | + TYPE VECTOR | ||
757 | + FILLED FALSE | ||
758 | + POINTS | ||
759 | + 2 0 | ||
760 | + 3 4 | ||
761 | + 4 4 | ||
762 | + 4 5 | ||
763 | + 0 5 | ||
764 | + 0 4 | ||
765 | + 1 4 | ||
766 | + 2 0 | ||
767 | + END | ||
768 | + STYLE | ||
769 | + 1 13 1 13 | ||
770 | + END | ||
771 | + | ||
772 | + END | ||
773 | + | ||
774 | + SYMBOL | ||
775 | + NAME 'mineracaol' | ||
776 | + TYPE VECTOR | ||
777 | + FILLED FALSE | ||
778 | + POINTS | ||
779 | + 0 0 | ||
780 | + 5 5 | ||
781 | + 4 6 | ||
782 | + 3 7 | ||
783 | + 2 6 | ||
784 | + 0 5 | ||
785 | + 5 0 | ||
786 | + END | ||
787 | + STYLE | ||
788 | + 1 13 1 13 | ||
789 | + END | ||
790 | + | ||
791 | + END | ||
792 | + SYMBOL | ||
793 | + NAME 'cruzl' | ||
794 | + TYPE VECTOR | ||
795 | + FILLED TRUE | ||
796 | + POINTS | ||
797 | + 2 0 | ||
798 | + 3 0 | ||
799 | + 3 1 | ||
800 | + 5 1 | ||
801 | + 5 2 | ||
802 | + 3 2 | ||
803 | + 3 7 | ||
804 | + 2 7 | ||
805 | + 2 2 | ||
806 | + 0 2 | ||
807 | + 0 1 | ||
808 | + 2 1 | ||
809 | + 2 0 | ||
810 | + END | ||
811 | + STYLE | ||
812 | + 1 13 1 13 | ||
813 | + END | ||
814 | + | ||
815 | + END | ||
816 | + | ||
817 | +Symbol | ||
818 | + name "circlel" | ||
819 | + Type ELLIPSE | ||
820 | + Filled true | ||
821 | + POINTS | ||
822 | + 1 1 | ||
823 | + END | ||
824 | + STYLE | ||
825 | + 1 13 1 13 | ||
826 | + END | ||
827 | + | ||
528 | END | 828 | END |
529 | 829 | ||
530 | 830 | ||
531 | 831 | ||
832 | + |
symbols/simboloslin.sym
@@ -25,7 +25,7 @@ Symbol | @@ -25,7 +25,7 @@ Symbol | ||
25 | END | 25 | END |
26 | END | 26 | END |
27 | Symbol | 27 | Symbol |
28 | - Name "pt1" | 28 | + Name "pt1l" |
29 | Type VECTOR | 29 | Type VECTOR |
30 | TRANSPARENT 0 | 30 | TRANSPARENT 0 |
31 | Points | 31 | Points |
@@ -38,7 +38,7 @@ END | @@ -38,7 +38,7 @@ END | ||
38 | END | 38 | END |
39 | 39 | ||
40 | Symbol | 40 | Symbol |
41 | - name "pt2" | 41 | + name "pt2l" |
42 | TYPE ELLIPSE | 42 | TYPE ELLIPSE |
43 | POINTS 1 1 END | 43 | POINTS 1 1 END |
44 | FILLED true | 44 | FILLED true |
@@ -48,7 +48,7 @@ END | @@ -48,7 +48,7 @@ END | ||
48 | END | 48 | END |
49 | 49 | ||
50 | Symbol | 50 | Symbol |
51 | - Name "pt3" | 51 | + Name "pt3l" |
52 | Type ELLIPSE | 52 | Type ELLIPSE |
53 | POINTS 1 1 END | 53 | POINTS 1 1 END |
54 | Transparent 0 | 54 | Transparent 0 |
@@ -83,7 +83,7 @@ END | @@ -83,7 +83,7 @@ END | ||
83 | 1 1 | 83 | 1 1 |
84 | END | 84 | END |
85 | STYLE | 85 | STYLE |
86 | - 20 10 20 10 | 86 | + 8 3 |
87 | END | 87 | END |
88 | END | 88 | END |
89 | 89 | ||
@@ -105,14 +105,11 @@ END | @@ -105,14 +105,11 @@ END | ||
105 | FILLED true | 105 | FILLED true |
106 | POINTS | 106 | POINTS |
107 | 2 0 | 107 | 2 0 |
108 | - END | ||
109 | - STYLE | ||
110 | - 8 8 1 8 | ||
111 | - END | 108 | + END |
112 | END | 109 | END |
113 | 110 | ||
114 | Symbol | 111 | Symbol |
115 | - Name "seta" | 112 | + Name "setal" |
116 | Type PIXMAP | 113 | Type PIXMAP |
117 | Image "seta.png" | 114 | Image "seta.png" |
118 | STYLE | 115 | STYLE |
@@ -121,7 +118,7 @@ END | @@ -121,7 +118,7 @@ END | ||
121 | END | 118 | END |
122 | 119 | ||
123 | Symbol | 120 | Symbol |
124 | - Name "sede" | 121 | + Name "sedel" |
125 | Type PIXMAP | 122 | Type PIXMAP |
126 | Image "sede.png" | 123 | Image "sede.png" |
127 | Transparent 1 | 124 | Transparent 1 |
@@ -132,7 +129,7 @@ END | @@ -132,7 +129,7 @@ END | ||
132 | END | 129 | END |
133 | 130 | ||
134 | Symbol | 131 | Symbol |
135 | - Name "cidmun" | 132 | + Name "cidmunl" |
136 | Type PIXMAP | 133 | Type PIXMAP |
137 | Image "cidmun.png" | 134 | Image "cidmun.png" |
138 | STYLE | 135 | STYLE |
@@ -142,7 +139,7 @@ END | @@ -142,7 +139,7 @@ END | ||
142 | END | 139 | END |
143 | 140 | ||
144 | Symbol | 141 | Symbol |
145 | - Name "capital" | 142 | + Name "capitall" |
146 | Type PIXMAP | 143 | Type PIXMAP |
147 | Image "capital.png" | 144 | Image "capital.png" |
148 | STYLE | 145 | STYLE |
@@ -152,7 +149,7 @@ END | @@ -152,7 +149,7 @@ END | ||
152 | END | 149 | END |
153 | 150 | ||
154 | Symbol | 151 | Symbol |
155 | - Name "cidade" | 152 | + Name "cidadel" |
156 | Type PIXMAP | 153 | Type PIXMAP |
157 | Image "cidade.png" | 154 | Image "cidade.png" |
158 | STYLE | 155 | STYLE |
@@ -162,7 +159,7 @@ END | @@ -162,7 +159,7 @@ END | ||
162 | END | 159 | END |
163 | 160 | ||
164 | Symbol | 161 | Symbol |
165 | - Name "vila" | 162 | + Name "vilal" |
166 | Type PIXMAP | 163 | Type PIXMAP |
167 | Image "vila.png" | 164 | Image "vila.png" |
168 | STYLE | 165 | STYLE |
@@ -172,7 +169,7 @@ END | @@ -172,7 +169,7 @@ END | ||
172 | END | 169 | END |
173 | 170 | ||
174 | Symbol | 171 | Symbol |
175 | - Name "xy" | 172 | + Name "xyl" |
176 | Type PIXMAP | 173 | Type PIXMAP |
177 | Image "xy.png" | 174 | Image "xy.png" |
178 | STYLE | 175 | STYLE |
@@ -182,7 +179,7 @@ END | @@ -182,7 +179,7 @@ END | ||
182 | END | 179 | END |
183 | 180 | ||
184 | Symbol | 181 | Symbol |
185 | - Name "xyr" | 182 | + Name "xyrl" |
186 | Type PIXMAP | 183 | Type PIXMAP |
187 | Image "xyr.png" | 184 | Image "xyr.png" |
188 | STYLE | 185 | STYLE |
@@ -192,7 +189,7 @@ END | @@ -192,7 +189,7 @@ END | ||
192 | END | 189 | END |
193 | 190 | ||
194 | Symbol | 191 | Symbol |
195 | - Name "porto" | 192 | + Name "portol" |
196 | Type PIXMAP | 193 | Type PIXMAP |
197 | Image "porto.png" | 194 | Image "porto.png" |
198 | STYLE | 195 | STYLE |
@@ -202,7 +199,7 @@ END | @@ -202,7 +199,7 @@ END | ||
202 | END | 199 | END |
203 | 200 | ||
204 | Symbol | 201 | Symbol |
205 | - Name "ref" | 202 | + Name "refl" |
206 | Type PIXMAP | 203 | Type PIXMAP |
207 | Image "ref.png" | 204 | Image "ref.png" |
208 | STYLE | 205 | STYLE |
@@ -212,7 +209,7 @@ END | @@ -212,7 +209,7 @@ END | ||
212 | END | 209 | END |
213 | 210 | ||
214 | Symbol | 211 | Symbol |
215 | - Name "marca" | 212 | + Name "marcal" |
216 | Type PIXMAP | 213 | Type PIXMAP |
217 | Image "marca.png" | 214 | Image "marca.png" |
218 | STYLE | 215 | STYLE |
@@ -223,7 +220,7 @@ END | @@ -223,7 +220,7 @@ END | ||
223 | 220 | ||
224 | 221 | ||
225 | Symbol | 222 | Symbol |
226 | - Name "ponto" | 223 | + Name "pontol" |
227 | Type ELLIPSE | 224 | Type ELLIPSE |
228 | FILLED true | 225 | FILLED true |
229 | TRANSPARENT 0 | 226 | TRANSPARENT 0 |
@@ -238,7 +235,7 @@ END | @@ -238,7 +235,7 @@ END | ||
238 | END | 235 | END |
239 | 236 | ||
240 | Symbol | 237 | Symbol |
241 | - NAME 'quadrado' | 238 | + NAME 'quadradol' |
242 | TYPE VECTOR | 239 | TYPE VECTOR |
243 | FILLED TRUE | 240 | FILLED TRUE |
244 | POINTS | 241 | POINTS |
@@ -255,7 +252,7 @@ END | @@ -255,7 +252,7 @@ END | ||
255 | END | 252 | END |
256 | 253 | ||
257 | SYMBOL | 254 | SYMBOL |
258 | - NAME "estrela" | 255 | + NAME "estrelal" |
259 | TYPE vector | 256 | TYPE vector |
260 | FILLED TRUE | 257 | FILLED TRUE |
261 | POINTS | 258 | POINTS |
@@ -278,7 +275,7 @@ END | @@ -278,7 +275,7 @@ END | ||
278 | END | 275 | END |
279 | 276 | ||
280 | SYMBOL | 277 | SYMBOL |
281 | - NAME 'triangulo' | 278 | + NAME 'triangulol' |
282 | TYPE VECTOR | 279 | TYPE VECTOR |
283 | FILLED TRUE | 280 | FILLED TRUE |
284 | POINTS | 281 | POINTS |
@@ -294,7 +291,7 @@ END | @@ -294,7 +291,7 @@ END | ||
294 | END | 291 | END |
295 | 292 | ||
296 | SYMBOL | 293 | SYMBOL |
297 | - NAME 'industria' | 294 | + NAME 'industrial' |
298 | TYPE VECTOR | 295 | TYPE VECTOR |
299 | FILLED TRUE | 296 | FILLED TRUE |
300 | POINTS | 297 | POINTS |
@@ -313,7 +310,7 @@ END | @@ -313,7 +310,7 @@ END | ||
313 | END | 310 | END |
314 | 311 | ||
315 | SYMBOL | 312 | SYMBOL |
316 | - NAME 'torre' | 313 | + NAME 'torrel' |
317 | TYPE VECTOR | 314 | TYPE VECTOR |
318 | FILLED FALSE | 315 | FILLED FALSE |
319 | POINTS | 316 | POINTS |
@@ -333,7 +330,7 @@ END | @@ -333,7 +330,7 @@ END | ||
333 | END | 330 | END |
334 | 331 | ||
335 | SYMBOL | 332 | SYMBOL |
336 | - NAME 'mineracao' | 333 | + NAME 'mineracaol' |
337 | TYPE VECTOR | 334 | TYPE VECTOR |
338 | FILLED FALSE | 335 | FILLED FALSE |
339 | POINTS | 336 | POINTS |
@@ -351,7 +348,7 @@ END | @@ -351,7 +348,7 @@ END | ||
351 | 348 | ||
352 | END | 349 | END |
353 | SYMBOL | 350 | SYMBOL |
354 | - NAME 'cruz' | 351 | + NAME 'cruzl' |
355 | TYPE VECTOR | 352 | TYPE VECTOR |
356 | FILLED TRUE | 353 | FILLED TRUE |
357 | POINTS | 354 | POINTS |
@@ -376,7 +373,7 @@ END | @@ -376,7 +373,7 @@ END | ||
376 | END | 373 | END |
377 | 374 | ||
378 | Symbol | 375 | Symbol |
379 | - name "circle" | 376 | + name "circlel" |
380 | Type ELLIPSE | 377 | Type ELLIPSE |
381 | Filled true | 378 | Filled true |
382 | POINTS | 379 | POINTS |