From 900a91e99df0bb31bff7923c8a54e728acb03760 Mon Sep 17 00:00:00 2001 From: sasbot <> Date: Sat, 6 Jun 2020 12:00:00 +0000 Subject: [PATCH] update zmp --- .hgignore | 1 + BuildZMmp.cmd | 3 +- BuildZMmp.wsf | 81 ++++++++++++++++++++++++++++++ Maps/Read.me | 1 - ProGorod1.zmp/zoom | 13 +++++ Update.cmd | 28 +++++++++++ progorod_wms.zmp/18.bmp | Bin 1062 -> 0 bytes progorod_wms.zmp/24.bmp | Bin 1782 -> 0 bytes progorod_wms.zmp/GetUrlScript.BAK | 37 -------------- progorod_wms.zmp/GetUrlScript.txt | 37 -------------- progorod_wms.zmp/params.BAK | 25 --------- progorod_wms.zmp/params.txt | 25 --------- 12 files changed, 124 insertions(+), 127 deletions(-) create mode 100644 BuildZMmp.wsf delete mode 100644 Maps/Read.me create mode 100644 ProGorod1.zmp/zoom create mode 100644 Update.cmd delete mode 100644 progorod_wms.zmp/18.bmp delete mode 100644 progorod_wms.zmp/24.bmp delete mode 100644 progorod_wms.zmp/GetUrlScript.BAK delete mode 100644 progorod_wms.zmp/GetUrlScript.txt delete mode 100644 progorod_wms.zmp/params.BAK delete mode 100644 progorod_wms.zmp/params.txt 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 4cabb2306a0c9369da461bae6fd296822fb786e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1062 zcmYL{`%hD69L8C)pUkE*lDWmp)It^0Q^1xn1c5>iy$BWrj!-UbLv3kcAQTF23kbAI z5EQ7S7iiC+18kvOT44&>b z@IQWrUC94KIZV2k2L6mGmYPQc#dJ_a2L*Ic%%tTrXktceHj{RYvX3~?o!c2NLI40=CnN_EQUZY#fCvQ!riX03@>x_ENi4rh6HrNZqq>ZjIAqe9jjb+w zpQQ_)9O1)gHlU?w% zMeiIyCI|J-Zq3Z7L0wbgaXUMkWCb+;C)}8P@KQJ`rF++80>#X8&x(>%5=d7J!DSiG zbK~{Z{Q6v~s`QSs4Ei;T(p&cV`?QOQjY${ZE?5V3 zPnYe+jn|e1yK!@3Sd&L@9J*#7ee|9%McpQ$dx~-L$Q{76Jp?=G4P-OkkEBQ&8dBKEgg;zRDBb9u@ z`_-|DUgg^<^M-qD)n%F+@13zBpVqCPcc$uhKsQq8YLyr(7(*3NqqTQ2B=KmkXIl8S zTBcPNYpDc>|9fcqDQi4J7| diff --git a/progorod_wms.zmp/24.bmp b/progorod_wms.zmp/24.bmp deleted file mode 100644 index a3202b0f923248e3a4915d96c15b67fbfdb4d183..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1782 zcmZXUdr(qY9LL$6U3aSSkDX1!N}Hhs1bk5WK;$Keid+%Iw}6O%nMw+1q!?;uqLw0+ zA!Vs$Dr#zvaqYEcDs{yD!|qNOF6uPtmTtsM-u2wPkp!5EYu+>YX~h77kS!R>wFcGmEQ+j+t5 zeBi5n?S3FTtO>@VmaCR?95aCB?kZ)_6s*834y5KlN;WH#!_EwYKq$hX^e`xc3uW`d zl%Z@{Al)D5!lTocI{@}^!AKx>QL;RZ9h^+3Nhu^L*)N$!kx)sAOCh3?gj5oEip-yq zL?NYyvUYEi#smlXV6b1T_)NNl!&b)dIc_MvE0T|Oj=-V$7$naH#X_T57&Oln8ID7S zx}vx)D2_9lhrw}BNG=|mB^Ja%>}Ym~)he8b-=86k@IuFIMTk5$i0~VQn^6KhO0d;^ zad9!i&pUPtLh89G3hyj-!|~B>eB4$M)=hv#M0(+L=_w4aEx;#{Nyy+(wJ||aUI-Z- zC!?U_yb&oOJ_??H9L*E>sCEbv0&rsD#>`lTgy98d)Ja04G8I7dR^%>0lsq(89OMhR zZ^#pX7f6XFyMU$q6n-poGXOA33shEUK2~=8z;3|(=PcG4YZVf(Ieb=LY*+-|DbX9b zHy+Y(X%dHPMQQ?o-j)VX!Dy?iutL`f0|0%t#M+t)v!oG#~#ds;%CO;Tv-j3NDxo!tzr9sU;niroL;D|?c|ZGjYGmNUyQ%J~gnZ_A^+}k9WY>J=*G8sI zb1I=a9=nH)7{1W~%K6JHbuT1o2=D~xW z1LcsdWgDh7-J_Ikb2xNGQ`Y8sDdI41?fB29fP9Y-njPr}U@1zPfBj-|;Of;Ah31{n zWy#bxFQ)HZZP_mmn41|G?lb8lzHd=rEh^8_@Kr}6ZBOSAkEi0RVm6K6{`8p{C4L_! zE&({ZPxAKF^O@<9xo5+#pFTKkNPG5ldbGE*LLM?Vb8qmc8h!M-whYg9HKiibzD5W? ztqrVA_pB76$M2j4@=_^de&PmzHvRU6`6uV<3@t|O$9I!smn!FH$HuN%Dz}HuJsleE zuQiCAIK%4#q_1mVC&fA)00Ask>c3-ra0|HS-uiQ&sN5`@imA?;5>v{^Q)_ zuT9#y=R;2>`pz9MS$I7$dc|m#Bf9f_FYKY4w_B7-5=g*1o97aQ-8mF z{Ag^j{ou}bFGm(;fB)yj^rO2Mk7Nel`myHU_tS4*J)D0!ZYfDTk&5Xp3p`W6u-+T> zx#at&wl%8B4LS5vIn<6^MpI5e-7ZF>%C94r)~;oo&@fF(pRS#_W|c=zLC|G=be$%! zE)(C8?LF3@IHvl1{{Xi>Q^K92^5#798J%BOF6B%vsZ;0MttDK{^8vL}N9oWJ`}TNV z&iCrcBXntqO&Y&*1+?MXq{|gz>tVjsezSa{Q{8(+*j*{Ua3KDgkw0*Vd(+6fQNisu zg!fnSZXF2gGjMy2;a3ci*G-a%w%l9hlrQq-&~s2c*rXh^WDhkfr!6Tn?MaiZsZ*A; z$E_)kTGOVQl%vf%Mq5(H+ja~#D$bY7mTUjdcTCXznvlsOtf^Y&Zzk?&4S&cC-8ON4 TITSl^IA)}pKYAqm|Em80QzVf; 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