|
@@ -177,8 +177,8 @@ class Route_UrlAction_WmsGenerate extends RouteBase {
|
|
|
$mapLayer->datasource=$destFolderPath.'/.wms/'.basename($mapLayer->datasource);
|
|
$mapLayer->datasource=$destFolderPath.'/.wms/'.basename($mapLayer->datasource);
|
|
|
$bash='
|
|
$bash='
|
|
|
tmp=`mktemp -d`
|
|
tmp=`mktemp -d`
|
|
|
-ogr2ogr -s_srs EPSG:'.$mapLayer->srs->spatialrefsys->srid.' -t_srs EPSG:4236 "$tmp/tmp.shp" "'.$mapLayer->datasource.'" >/dev/null 2>&1
|
|
|
|
|
-extent=`ogrinfo -al -so "$tmp/tmp.shp" | grep Extent | sed "s/[(),\-]//g;s/ / /g;s/Extent: //g"`
|
|
|
|
|
|
|
+/opt/local/bin/ogr2ogr -s_srs EPSG:'.$mapLayer->srs->spatialrefsys->srid.' -t_srs EPSG:4236 "$tmp/tmp.shp" "'.$mapLayer->datasource.'" >/dev/null 2>&1
|
|
|
|
|
+extent=`/opt/local/bin/ogrinfo -al -so "$tmp/tmp.shp" | grep Extent | sed "s/[(),\-]//g;s/ / /g;s/Extent: //g"`
|
|
|
echo "${extent} "
|
|
echo "${extent} "
|
|
|
rm -rf $tmp
|
|
rm -rf $tmp
|
|
|
';
|
|
';
|
|
@@ -471,11 +471,11 @@ rm -rf __PATH__/.wms
|
|
|
mkdir __PATH__/.wms
|
|
mkdir __PATH__/.wms
|
|
|
lock="/tmp/generate_wms-__ID__.lock"
|
|
lock="/tmp/generate_wms-__ID__.lock"
|
|
|
touch ${lock}
|
|
touch ${lock}
|
|
|
-gdaltindex -t_srs epsg:4326 /tmp/generate_wms-__ID__-shp_wgs84.shp "__PATH__/__FILE__" >/dev/null 2>&1
|
|
|
|
|
-ogr2ogr -f CSV /tmp/generate_wms-__ID__-shp_wgs84.csv /tmp/generate_wms-__ID__-shp_wgs84.shp -lco GEOMETRY=AS_WKT
|
|
|
|
|
|
|
+/opt/local/bin/gdaltindex -t_srs epsg:4326 /tmp/generate_wms-__ID__-shp_wgs84.shp "__PATH__/__FILE__" >/dev/null 2>&1
|
|
|
|
|
+/opt/local/bin/ogr2ogr -f CSV /tmp/generate_wms-__ID__-shp_wgs84.csv /tmp/generate_wms-__ID__-shp_wgs84.shp -lco GEOMETRY=AS_WKT
|
|
|
wgs84=`cat /tmp/generate_wms-__ID__-shp_wgs84.csv |tr -d "\n" | cut -d "\"" -f 2`
|
|
wgs84=`cat /tmp/generate_wms-__ID__-shp_wgs84.csv |tr -d "\n" | cut -d "\"" -f 2`
|
|
|
-gdaltindex /tmp/generate_wms-__ID__-shp_orig.shp "__PATH__/__FILE__" >/dev/null 2>&1
|
|
|
|
|
-extent=`ogrinfo -al -so /tmp/generate_wms-__ID__-shp_orig.shp | grep Extent | sed "s/[(),\-]//g;s/ / /g;s/Extent: //g"`
|
|
|
|
|
|
|
+/opt/local/bin/gdaltindex /tmp/generate_wms-__ID__-shp_orig.shp "__PATH__/__FILE__" >/dev/null 2>&1
|
|
|
|
|
+extent=`/opt/local/bin/ogrinfo -al -so /tmp/generate_wms-__ID__-shp_orig.shp | grep Extent | sed "s/[(),\-]//g;s/ / /g;s/Extent: //g"`
|
|
|
rm -f /tmp/generate_wms-__ID__-shp_*
|
|
rm -f /tmp/generate_wms-__ID__-shp_*
|
|
|
echo "${wgs84}|${extent}|" > __PATH__/.wms/.data
|
|
echo "${wgs84}|${extent}|" > __PATH__/.wms/.data
|
|
|
ok=0
|
|
ok=0
|
|
@@ -498,8 +498,7 @@ fi
|
|
|
DB::getDB()->UPDATE_OBJ('WMS_LAYERS',(object) array('ID'=>$layer['ID'],'FILE_STATUS'=>'ERROR','FILE_STATUS_INFO'=>'Wystąpił błąd pliku tif'));
|
|
DB::getDB()->UPDATE_OBJ('WMS_LAYERS',(object) array('ID'=>$layer['ID'],'FILE_STATUS'=>'ERROR','FILE_STATUS_INFO'=>'Wystąpił błąd pliku tif'));
|
|
|
throw new Exception("Błąd pliku: ".$layer['FILE_NAME']);
|
|
throw new Exception("Błąd pliku: ".$layer['FILE_NAME']);
|
|
|
}
|
|
}
|
|
|
- $xml=@simplexml_load_string(shell_exec('gdalsrsinfo -o xml '.$destFolderPath.'/'.$layer['FILE_NAME']));
|
|
|
|
|
-//var_dump($xml);
|
|
|
|
|
|
|
+ $xml=@simplexml_load_string(shell_exec('/opt/local/bin/gdalsrsinfo -o xml '.$destFolderPath.'/'.$layer['FILE_NAME']));
|
|
|
$epsg=$xml->{'gml:srsID'}->{'gml:name'};
|
|
$epsg=$xml->{'gml:srsID'}->{'gml:name'};
|
|
|
if (!$epsg) {
|
|
if (!$epsg) {
|
|
|
DB::getDB()->UPDATE_OBJ('WMS_LAYERS',(object) array('ID'=>$layer['ID'],'FILE_STATUS'=>'ERROR','FILE_STATUS_INFO'=>'Wystąpił błąd pliku tif - brak informacji o układzie współrzędnych'));
|
|
DB::getDB()->UPDATE_OBJ('WMS_LAYERS',(object) array('ID'=>$layer['ID'],'FILE_STATUS'=>'ERROR','FILE_STATUS_INFO'=>'Wystąpił błąd pliku tif - brak informacji o układzie współrzędnych'));
|