Permalink
Browse files

Intent Lines corrected, minor code-style fixes, unused variables remo…

…ved, typo corrected, gitignore
  • Loading branch information...
1 parent 6b8d257 commit 878c700990d3669f079146233777f9a15b8412d7 glender committed Oct 2, 2011
Showing with 740 additions and 305 deletions.
  1. +1 −0 .gitignore
  2. +1 −0 .idea/.name
  3. +9 −0 .idea/_GIT_.iml
  4. +5 −0 .idea/encodings.xml
  5. +11 −0 .idea/misc.xml
  6. +9 −0 .idea/modules.xml
  7. +7 −0 .idea/vcs.xml
  8. +401 −0 .idea/workspace.xml
  9. +3 −3 index.php
  10. +9 −9 mapito/img/genCache.php
  11. +39 −46 mapito/img/mapito.php
  12. +4 −4 mapito/img/svg2png.php
  13. +180 −182 mapito/js/mapito.js
  14. +60 −60 needles.php
  15. +1 −1 readme.txt
View
@@ -0,0 +1 @@
+.DS_Store
View
@@ -0,0 +1 @@
+_GIT_
View
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+ <component name="NewModuleRootManager">
+ <content url="file://$MODULE_DIR$" />
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
+
View
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+</project>
+
View
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="DependencyValidationManager">
+ <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+ </component>
+ <component name="ProjectResources">
+ <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
+ </component>
+ <component name="ProjectRootManager" version="2" />
+</project>
+
View
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectModuleManager">
+ <modules>
+ <module fileurl="file://$PROJECT_DIR$/.idea/_GIT_.iml" filepath="$PROJECT_DIR$/.idea/_GIT_.iml" />
+ </modules>
+ </component>
+</project>
+
View
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="$PROJECT_DIR$" vcs="Git" />
+ </component>
+</project>
+
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -19,7 +19,7 @@
*/
if ($_GET["dev"]== 1) {
-?>
+ ?>
<div style='background-color: #f0f; z-index: 215; position: absolute; width:100%; height:1px; left: 0px; top: 50%;'>
</div>
@@ -49,8 +49,8 @@
<link media="all" href="./mapito/css/mapito.css" type="text/css" rel="stylesheet">
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js" type="text/javascript"></script>
- <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js" type="text/javascript"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js" type="text/javascript"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js" type="text/javascript"></script>
<script type="text/javascript" src="./mapito/js/mapito.js"></script>
</head>
View
@@ -25,25 +25,25 @@
// do something like
// chown -R signalwerk:psacln ./img/cach/
-set_time_limit(600000);
+set_time_limit(600000);
include_once "./mapito.php";
$tile = new shTile();
-$tile->setZoom(0.125);
+$tile->setZoom(0.125);
$tile->PosX = 0.5;
$tile->PosY = 0.5;
-if (ob_get_level() == 0) ob_start();
+if (ob_get_level() == 0) ob_start();
foreach($tile->ZoomLevels as $myLevel) {
- $tile->setZoom($myLevel);
-
- $tile->DivW = 15000 * $myLevel;
- $tile->DivH = 15000 * $myLevel;
-
- $tile->genDrag();
+ $tile->setZoom($myLevel);
+
+ $tile->DivW = 15000 * $myLevel;
+ $tile->DivH = 15000 * $myLevel;
+
+ $tile->genDrag();
}
print "end";
View
@@ -15,12 +15,6 @@ class shTile {
public $ViewW, $ViewH;
public $OffsetX, $OffsetY;
- // Tile x-/y-Start
- private $TileX, $TileY;
-
- // Tile Counts based on W and H
- private $TileCountX, $TileCountY;
-
//private $FilePath, $TileW, $TileH;
private $RootPath, $RootCachePath;
@@ -120,73 +114,72 @@ function genDrag( ) {
- include_once "./../../needles.php";
- // $myPointers = dynPointers();
+ include_once "./../../needles.php";
+ // $myPointers = dynPointers();
- for ($i = 0; $i < count($myPointers); $i++) {
+ for ($i = 0; $i < count($myPointers); $i++) {
- $myCurrentPoint = $myPointers[$i];
- // zh on new map
- $PointX = $myCurrentPoint["PointX"];
- //print_r ($myCurrentPoint["PointX"]);
+ $myCurrentPoint = $myPointers[$i];
+ // zh on new map
+ $PointX = $myCurrentPoint["PointX"];
+ //print_r ($myCurrentPoint["PointX"]);
- $PointY = $myCurrentPoint["PointY"];
+ $PointY = $myCurrentPoint["PointY"];
- $PointType = 0;
- $PointText = $myCurrentPoint["PointText"];
- $Link = $myCurrentPoint["Link"];
+ $PointText = $myCurrentPoint["PointText"];
+ $Link = $myCurrentPoint["Link"];
- $PointerPicW = 25;
- $PointerPicWHalf = 12;
- $PointerPicH = 41;
+ $PointerPicW = 25;
+ $PointerPicWHalf = 12;
+ $PointerPicH = 41;
- // gibt an, wo die linke bildkante liegt
- $pxPointX = ($this->DivW/2) - ($this->PicScaleW*$this->PosX) + ($this->PicScaleW * $PointX);
- $pxPointY = ($this->DivH/2) - ($this->PicScaleH*$this->PosY) + ($this->PicScaleH * $PointY);
+ // gibt an, wo die linke bildkante liegt
+ $pxPointX = ($this->DivW/2) - ($this->PicScaleW*$this->PosX) + ($this->PicScaleW * $PointX);
+ $pxPointY = ($this->DivH/2) - ($this->PicScaleH*$this->PosY) + ($this->PicScaleH * $PointY);
- // DIV
- // 689 / 2
- // 345
+ // DIV
+ // 689 / 2
+ // 345
- $EndPointX = $pxPointX - $this->DivXshift - $PointerPicWHalf ;
- $EndPointY = $pxPointY - $this->DivYshift - $PointerPicH ;
+ $EndPointX = $pxPointX - $this->DivXshift - $PointerPicWHalf ;
+ $EndPointY = $pxPointY - $this->DivYshift - $PointerPicH ;
- $myOut .= "<div class='pointerDiv' style='height: ".$PointerPicH."px; left: ".floor($EndPointX)."px; top: ".floor($EndPointY)."px;'>";
+ $myOut .= "<div class='pointerDiv' style='height: ".$PointerPicH."px; left: ".floor($EndPointX)."px; top: ".floor($EndPointY)."px;'>";
- $myOut .= "<div id='leg_".$i."' class='legPointer'>";
- $myOut .= $PointText;
- $myOut .= "</div>";
+ $myOut .= "<div id='leg_".$i."' class='legPointer'>";
+ $myOut .= $PointText;
+ $myOut .= "</div>";
- $myOut .= "<div id='point_".$i."' class='imgPointer'>";
+ $myOut .= "<div id='point_".$i."' class='imgPointer'>";
- $myOut .= "<img ";
- // $myOut .= "id='point_".$Link."'";
- // $myOut .= "onClick='pointerAction(".$Link.",\"".$PointText."\")'";
+ $myOut .= "<img ";
+ // $myOut .= "id='point_".$Link."'";
+ // $myOut .= "onClick='pointerAction(".$Link.",\"".$PointText."\")'";
- $myOut .= "onClick='parent.location=\"".$Link."\"' ";
- $myOut .= "onmouseover='pointerRollover(".$i.")' ";
- $myOut .= "onmouseout='pointerRolloverEnd(".$i.")' ";
+ $myOut .= "onClick='parent.location=\"".$Link."\"' ";
+ $myOut .= "onmouseover='pointerRollover(".$i.")' ";
+ $myOut .= "onmouseout='pointerRolloverEnd(".$i.")' ";
- $myOut .= "style='width: ".$PointerPicW."px; height: ".$PointerPicH."px; class='PointerImage' ";
- $myOut .= "src='./mapito/img/pointer.png'/>";
+ $myOut .= "style='width: ".$PointerPicW."px; height: ".$PointerPicH."px; class='PointerImage' ";
+ $myOut .= "src='./mapito/img/pointer.png'/>";
- $myOut .= "</div>";
+ $myOut .= "</div>";
- $myOut .= "</div>";
+ $myOut .= "</div>";
- }
+ }
$myOut .= '</div>';
@@ -222,7 +215,7 @@ public function generateDIV() {
$myOut .= "</div>";
}
}
-
+
return $myOut;
}
@@ -231,7 +224,7 @@ public function generateIMG($x,$y) {
if ($x < 0) {
$x = -1;
}
-
+
if ($y < 0) {
$y = -1;
}
View
@@ -32,14 +32,14 @@
// Now you can do anything with the image, such as convert to a raster image and output it to the browser:
$im->setImageFormat("png");
-$fp =fopen($myDestinationPath, 'w');
-@fwrite($fp, $im);
-@fclose($fp);
+$fp =fopen($myDestinationPath, 'w');
+@fwrite($fp, $im);
+@fclose($fp);
// To output the image to the explorer
// header("Content-Type: image/png");
// echo $im;
-
+
echo "rendering done. saved: ".$myDestinationPath;
Oops, something went wrong.

0 comments on commit 878c700

Please sign in to comment.