Commit 6920cf73af1440a07306d6bff287746e97b0a106
1 parent
e73c3ca6
Exists in
master
and in
7 other branches
--no commit message
Showing
6 changed files
with
17 additions
and
7 deletions
Show diff stats
admin/js/editormapfile.js
... | ... | @@ -1909,7 +1909,13 @@ function salvarDadosEditor(tipo,codigoMap,codigoLayer,indiceClasse,indiceEstilo, |
1909 | 1909 | { |
1910 | 1910 | if(testar == false){ |
1911 | 1911 | if(tipo=="conexao") |
1912 | - {montaEditorConexao(YAHOO.lang.JSON.parse(o.responseText));} | |
1912 | + {montaEditorDados(YAHOO.lang.JSON.parse(o.responseText));} | |
1913 | + if(tipo=="comport") | |
1914 | + {montaEditorComport(YAHOO.lang.JSON.parse(o.responseText));} | |
1915 | + if(tipo=="dispo") | |
1916 | + {montaEditorDispo(YAHOO.lang.JSON.parse(o.responseText));} | |
1917 | + if(tipo=="titulo") | |
1918 | + {montaEditorTitulo(YAHOO.lang.JSON.parse(o.responseText));} | |
1913 | 1919 | if(tipo=="metadados") |
1914 | 1920 | {montaEditorMetadados(YAHOO.lang.JSON.parse(o.responseText));} |
1915 | 1921 | if(tipo=="geral") | ... | ... |
admin/php/admin.php
... | ... | @@ -83,10 +83,10 @@ Imprime na saída a string JSON |
83 | 83 | function retornaJSON($obj) |
84 | 84 | { |
85 | 85 | global $locaplic; |
86 | - if(function_exists("json_encode")) | |
87 | - {echojson(json_encode($obj));} | |
88 | - else | |
89 | - { | |
86 | + //if(function_exists("json_encode")) | |
87 | + //{echojson(json_encode($obj));} | |
88 | + //else | |
89 | + //{ | |
90 | 90 | include_once($locaplic."/pacotes/cpaint/JSON/json2.php"); |
91 | 91 | error_reporting(0); |
92 | 92 | $j = new Services_JSON(); |
... | ... | @@ -94,7 +94,7 @@ function retornaJSON($obj) |
94 | 94 | if (!mb_detect_encoding($texto,"UTF-8",true)) |
95 | 95 | $texto = utf8_encode($texto); |
96 | 96 | echo $texto; |
97 | - } | |
97 | + //} | |
98 | 98 | /* |
99 | 99 | include_once($locaplic."/pacotes/cpaint/JSON/json2.php"); |
100 | 100 | error_reporting(0); | ... | ... |
admin/php/conexao.php
aplicmap/ogcws.map
aplicmap/ogcwsv5.map
aplicmap/ogcwsv6.map
... | ... | @@ -18,7 +18,7 @@ MAP |
18 | 18 | NAME 'png' |
19 | 19 | MIMETYPE "image/png" |
20 | 20 | DRIVER AGG/PNG |
21 | - IMAGEMODE RGB | |
21 | + IMAGEMODE RGBA | |
22 | 22 | FORMATOPTION "QUANTIZE_FORCE=ON" |
23 | 23 | FORMATOPTION "QUANTIZE_DITHER=OFF" |
24 | 24 | FORMATOPTION "QUANTIZE_COLORS=256" |
... | ... | @@ -105,6 +105,7 @@ MAP |
105 | 105 | "ows_namespace_uri" "http://www.omsug.ca/osgis2004" |
106 | 106 | "ows_address" "http://www.mma.gov.br" |
107 | 107 | "ows_postcode" "" |
108 | + "ows_enable_request" "*" | |
108 | 109 | END |
109 | 110 | QUERYFORMAT text/html |
110 | 111 | LEGENDFORMAT text/html | ... | ... |