diff --git a/.hgignore b/.hgignore index f6adc7e7e..2c848aab3 100644 --- a/.hgignore +++ b/.hgignore @@ -1,6 +1,7 @@ # use glob syntax. syntax: glob .bin/* +.tmp/* *.bak *.~* *.orig \ No newline at end of file diff --git a/BuildZMmp.cmd b/BuildZMmp.cmd index 922c7d712..c392f0b00 100644 --- a/BuildZMmp.cmd +++ b/BuildZMmp.cmd @@ -1,2 +1 @@ -cscript BuildZMmp.js -xcopy .bin\progorod_wms.zmp E:\GoogleMV\maps\ /y \ No newline at end of file +cscript BuildZMmp.wsf /target:"..\Maps" \ No newline at end of file diff --git a/BuildZMmp.wsf b/BuildZMmp.wsf new file mode 100644 index 000000000..f5c68389a --- /dev/null +++ b/BuildZMmp.wsf @@ -0,0 +1,81 @@ + + + + +Example: cscript BuildZMmp.wsf /target:"..\Maps" + + + diff --git a/Maps/Read.me b/Maps/Read.me deleted file mode 100644 index 3d0a90d62..000000000 --- a/Maps/Read.me +++ /dev/null @@ -1 +0,0 @@ -╟фхё№ сєфєЄ ёючфрэ√ Їрщы√ *.zmp \ No newline at end of file diff --git a/ProGorod1.zmp/zoom b/ProGorod1.zmp/zoom new file mode 100644 index 000000000..182950777 --- /dev/null +++ b/ProGorod1.zmp/zoom @@ -0,0 +1,13 @@ +16 +http://www.glekov.ru/lv15/00/000/020/330/000/017/633.png += +http://a.tile.openstreetmap.org//15/20427/11311.png + + + + +по карте +http://www.glekov.ru/lv15/00/000/019/905/000/017/449.png +должно быть +http://www.glekov.ru/lv15/00/000/019/937/000/017/630.png + diff --git a/Update.cmd b/Update.cmd new file mode 100644 index 000000000..5dcfb2a2f --- /dev/null +++ b/Update.cmd @@ -0,0 +1,28 @@ +@echo off +hg incoming "https://bitbucket.org/garl/plus.zmp/" +::echo %ERRORLEVEL% +IF ERRORLEVEL 9009 goto NoHg +IF ERRORLEVEL 2 goto err +IF ERRORLEVEL 1 goto noupdates +IF ERRORLEVEL 0 goto ok + +goto err + +:ok + echo Забраем изменения из репозитория + hg pull "https://bitbucket.org/garl/plus.zmp/" -u -f + IF ERRORLEVEL 1 goto err + IF NOT ERRORLEVEL 0 goto err + call BuildZMmp.cmd + goto end +:noupdates + echo Нет новых изменений + goto end +:err + echo Ошибка связи с сервером + goto end +:NoHg + echo Не установлен Mercurial + goto end +:end +pause \ No newline at end of file diff --git a/progorod_wms.zmp/18.bmp b/progorod_wms.zmp/18.bmp deleted file mode 100644 index 4cabb2306..000000000 Binary files a/progorod_wms.zmp/18.bmp and /dev/null differ diff --git a/progorod_wms.zmp/24.bmp b/progorod_wms.zmp/24.bmp deleted file mode 100644 index a3202b0f9..000000000 Binary files a/progorod_wms.zmp/24.bmp and /dev/null differ diff --git a/progorod_wms.zmp/GetUrlScript.BAK b/progorod_wms.zmp/GetUrlScript.BAK deleted file mode 100644 index 90aad78d9..000000000 --- a/progorod_wms.zmp/GetUrlScript.BAK +++ /dev/null @@ -1,37 +0,0 @@ -var -sx,sy,sz:string; -lx,ty:extended; -rx,by:extended; -res:array[0..24] of extended; - -begin -res[0]:=0; -res[1]:=50000; -res[2]:=49500; -res[3]:=25500; -res[4]:=9783; -res[5]:=4891.96980999999959749402; -res[6]:=2445; -res[7]:=1222; -res[8]:=611; -res[9]:=305; -res[10]:=152; -res[11]:=76; -res[12]:=38; -res[13]:=19; -res[14]:=9.5; -res[15]:=4.79999999999999982236; -res[16]:=2.39999999999999991118; -res[17]:=0; -res[18]:=0; -res[19]:=0; - -lx:=-20037508+(getx*res[getz]*256); -rx:=-20037508+((getx+1)*res[getz]*256); - -ty:=-15496570+((round(intpower(2,getz-1))-gety+1)*res[getz]*256); -by:=-15496570+((round(intpower(2,getz-1))-gety+0)*res[getz]*256); - - -ResultURL:=GetUrlBase+inttostr(getz)+'&BBOX='+RoundEX(lx,2)+','+RoundEX(by,2)+','+RoundEX(rx,2)+','+RoundEX(ty,2); -end. \ No newline at end of file diff --git a/progorod_wms.zmp/GetUrlScript.txt b/progorod_wms.zmp/GetUrlScript.txt deleted file mode 100644 index 23587354c..000000000 --- a/progorod_wms.zmp/GetUrlScript.txt +++ /dev/null @@ -1,37 +0,0 @@ -var -sx,sy,sz:string; -lx,ty:extended; -rx,by:extended; -res:array[0..24] of extended; - -begin -res[0]:= 0; -res[1]:= 50000; -res[2]:= 49500; -res[3]:= 25500; -res[4]:= 9783; -res[5]:= 4891.96980999999959749402; -res[6]:= 2445; -res[7]:= 1222; -res[8]:= 611; -res[9]:= 305; -res[10]:=152; -res[11]:=76; -res[12]:=38; -res[13]:=19; -res[14]:=9.5; -res[15]:=4.79999999999999982236; -res[16]:=2.39999999999999991118; -res[17]:=0; -res[18]:=0; -res[19]:=0; - -lx:=-20037508+(getx*res[getz]*256); -rx:=-20037508+((getx+1)*res[getz]*256); - -ty:=-15496570+((round(intpower(2,getz-1))-gety-1)*res[getz]*256); -by:=-15496570+((round(intpower(2,getz-1))-gety+0)*res[getz]*256); - - -ResultURL:=GetUrlBase+inttostr(getz)+'&BBOX='+RoundEX(lx,2)+','+RoundEX(by,2)+','+RoundEX(rx,2)+','+RoundEX(ty,2); -end. \ No newline at end of file diff --git a/progorod_wms.zmp/params.BAK b/progorod_wms.zmp/params.BAK deleted file mode 100644 index 6acd5c716..000000000 --- a/progorod_wms.zmp/params.BAK +++ /dev/null @@ -1,25 +0,0 @@ -[PARAMS] -pnum=19 -GUID={395F7E2F-41E6-4A25-83BA-6CE6310B00E8} -name=╩рЁЄр (pro-gorod.ru wms) -name_9=Map (pro-gorod.ru wms) -ParentSubMenu=─Ёєушх ърЁЄ√ -ParentSubMenu_9=Other maps -asLayer=0 -DefURLBase=http://www.glekov.ru/lv -projection=2 -sradiusa=6378137 -sradiusb=6356752 -NameInCache=progorodwms -separator=1 -Ext=.png -UseDwn=1 -Usestick=1 -UseGenPrevious=1 -Usedel=1 -Usesave=1 -UseAntiBan=0 -Sleep=0 -DefHotKey=32843 -ContentType=image/png -BanIfLen=0 \ No newline at end of file diff --git a/progorod_wms.zmp/params.txt b/progorod_wms.zmp/params.txt deleted file mode 100644 index 8a0352bfe..000000000 --- a/progorod_wms.zmp/params.txt +++ /dev/null @@ -1,25 +0,0 @@ -[PARAMS] -pnum=19 -GUID={395F7E2F-41E6-4A25-83BA-6CE6310B00E8} -name=╩рЁЄр (pro-gorod.ru wms) -name_9=Map (pro-gorod.ru wms) -ParentSubMenu=─Ёєушх ърЁЄ√ -ParentSubMenu_9=Other maps -asLayer=0 -DefURLBase=http://tiles.tmcrussia.com/f4091876df6a5d39e6690b7395a95399/?REQUEST=GetMap&FORMAT=image/png&LAYERS=lv -projection=2 -sradiusa=6378137 -sradiusb=6356752 -NameInCache=progorodwms -separator=1 -Ext=.png -UseDwn=1 -Usestick=1 -UseGenPrevious=1 -Usedel=1 -Usesave=1 -UseAntiBan=0 -Sleep=0 -DefHotKey=32843 -ContentType=image/png -BanIfLen=0 \ No newline at end of file