Changeset 1408

Timestamp:

Sep 25, 2010, 6:31:38 PM (10 years ago)

Author:

roux

Message:

map a partir du svg a partir de code de gabriel

Location:

cpc/trunk/project

Files:

• apps/frontend/config/routing.yml (modified) (1 diff)
• apps/frontend/modules/circonscription/actions/actions.class.php (modified) (4 diffs)
• apps/frontend/modules/circonscription/templates/listSuccess.php (modified) (2 diffs)
• apps/frontend/modules/parlementaire/templates/_top.php (modified) (1 diff)
• web/france_deptmts.svg (added)

cpc/trunk/project/apps/frontend/config/routing.yml

@@ -164 +164 @@
   url: /circonscription/image/:circo/:w/:h
   param: {module: circonscription, action: getCircoimagepng}
+deptmts_image_png:
+  url: /circonscription/cartedepts/:w/:h
+  param: {module: circonscription, action: getDeptmtsimagepng}
 redirect_parlementaires_circo:
   url: /circonscription/:code

cpc/trunk/project/apps/frontend/modules/circonscription/actions/actions.class.php

@@ -149 +149 @@
    * If only one of $w and $h is given, preserve the svg ratio.
    */
-  private static function compute_areas($dom, $w, $h, $regexp)
+  private static function compute_areas($dom, $w, $h, $regexp, $deptitle = 0)
   {
     $areas = "";
@@ -177 +177 @@
         $cs = self::compose_transform($path);
         $points = self::convert_path($path->getAttribute('d'), $cs, $ratio_w, $ratio_h);
-        $title = self::get_title($path);
-        $href = url_for("@redirect_parlementaires_circo?code=".$path->getAttribute('id'));
-        $areas .= "<area href=\"".$href."\" title=\"".$title."\" ".
+        if ($deptitle) {
+          $title = $path->getAttribute('title');
+          $id = preg_replace('/d/', '', $path->getAttribute('id'));
+          $href = url_for("@list_parlementaires_circo_search?search=$id");
+        } else {
+          $id = $path->getAttribute('id');
+          $title = self::get_title($path);
+          $href = url_for("@redirect_parlementaires_circo?code=".$path->getAttribute('id'));
+        }
+        $areas .= "<area id=\"map$id\" href=\"".$href."\" title=\"".$title."\" ".
           "shape=\"poly\" coords=\"".$points."\"></area>\n";
       }
@@ -229 +236 @@
   }
 
-
-  private static function generateSvgDom($circo, $w, $h)
-  {
+  private static function generateSvgDep($w, $h) {
     $dom = new DOMDocument();
     $dom->preserveWhiteSpace = FALSE;
     // FIXME Use loadXML to load from a string instead (database)
-    $dom->load("circo.svg");
-
-    if(preg_match("/^\d\d[\dab]$/",$circo))
-      self::crop_svg($dom, "/^$circo-\d\d$/", 10);
-
+    $dom->load("france_deptmts.svg");
     return $dom;
-
-  }
-
-  /* $circo is a three digits string, or "full" for the full map */
-  public static function echoCircoMap($circo, $w, $h)
-  {
-    $dom = self::generateSvgDom($circo, $w, $h);
-
-    if($circo == "full")
-      $regexp = "/^\d\d[\dab]-(0[1-9]|[1-9]\d)$/";
-    else
-      $regexp = "/^$circo-(0[1-9]|[1-9]\d)$/";
-
-    $r = self::compute_areas($dom, $w, $h, $regexp);
+  }
+
+  public static function echoDeptmtsMap($w, $h) {
+    $dom = self::generateSvgDep($w, $h);
+    $r = self::compute_areas($dom, $w, $h, '/^d\d+/', 1);
     $w = $r['w'];
     $h = $r['h'];
 
-    $src = url_for("@circo_image_png?circo=$circo&w=$w&h=$h");
-
-    echo "<img class=\"carte_departement\" src=\"$src\" usemap=\"#$circo\" ";
+    $src = url_for("@deptmts_image_png?w=$w&h=$h");
+
+    echo "<img class=\"carte_departement\" src=\"$src\" usemap=\"#deptmts\" ";
     echo 'style="width:'.$w.'px; height:'.$h.'px;" />';
-    echo "<map name=\"$circo\">";
+    echo "<map name=\"deptmts\">";
     echo $r['areas'];
     echo "</map>";
   }
 
-  /* $circo is a three digits string, or "full" for the full map */
-  private static function echoCircoImage($circo, $w, $h)
-  {
-
-    /* If you want to resize a vector-graphics image (such as SVG) to a
-     * certain dimension in pixels, without losing quality, you have to do
-     * this
-     * http://www.php.net/manual/en/function.imagick-setresolution.php
-     */
-
-    $dom = self::generateSvgDom($circo, $w, $h);
+  private static function echoDeptmtsImage($w, $h) {
+    $dom = self::generateSvgDep($w, $h);
 
     $im = new Imagick();
@@ -290 +273 @@
     $im->setImageFormat("png");
     echo $im;
+  }
+
+  private static function generateSvgDom($circo, $w, $h)
+  {
+    $dom = new DOMDocument();
+    $dom->preserveWhiteSpace = FALSE;
+    // FIXME Use loadXML to load from a string instead (database)
+    $dom->load("circo.svg");
+
+    if(preg_match("/^\d\d[\dab]$/",$circo))
+      self::crop_svg($dom, "/^$circo-\d\d$/", 10);
+
+    return $dom;
+
+  }
+
+  /* $circo is a three digits string, or "full" for the full map */
+  public static function echoCircoMap($circo, $w, $h)
+  {
+    $dom = self::generateSvgDom($circo, $w, $h);
+
+    if($circo == "full")
+      $regexp = "/^\d\d[\dab]-(0[1-9]|[1-9]\d)$/";
+    else
+      $regexp = "/^$circo-(0[1-9]|[1-9]\d)$/";
+
+    $r = self::compute_areas($dom, $w, $h, $regexp);
+    $w = $r['w'];
+    $h = $r['h'];
+
+    $src = url_for("@circo_image_png?circo=$circo&w=$w&h=$h");
+
+    echo "<img class=\"carte_departement\" src=\"$src\" usemap=\"#$circo\" ";
+    echo 'style="width:'.$w.'px; height:'.$h.'px;" />';
+    echo "<map name=\"$circo\">";
+    echo $r['areas'];
+    echo "</map>";
+  }
+
+  /* $circo is a three digits string, or "full" for the full map */
+  private static function echoCircoImage($circo, $w, $h)
+  {
+
+    /* If you want to resize a vector-graphics image (such as SVG) to a
+     * certain dimension in pixels, without losing quality, you have to do
+     * this
+     * http://www.php.net/manual/en/function.imagick-setresolution.php
+     */
+
+    $dom = self::generateSvgDom($circo, $w, $h);
+
+    $im = new Imagick();
+    $im->readImageBlob($dom->saveXML());
+    $res = $im->getImageResolution();
+    $x_ratio = $res['x'] / $im->getImageWidth();
+    $y_ratio = $res['y'] / $im->getImageHeight();
+    $im->removeImage();
+    $im->setResolution($w * $x_ratio, $h * $y_ratio);
+    $im->readImageBlob($dom->saveXML());
+
+    $im->setImageFormat("png");
+    echo $im;
+  }
+
+  public function executeGetDeptmtsimagepng(sfWebRequest $request) {
+    $w = $request->getParameter('w');
+    $h = $request->getParameter('h');
+    header("Content-type: image/png");
+    self::echoDeptmtsImage($w, $h);
+    return sfView::NONE;
   }
 

cpc/trunk/project/apps/frontend/modules/circonscription/templates/listSuccess.php

@@ -1 @@
-<h1 class="list_inter">Toutes les circonscriptions par département</h1><?php 
+<h1>Toutes les circonscriptions par département</h1><?php 
 $sf_response->setTitle('Toutes les circonscriptions électorales par département - NosDéputés.fr'); ?>
 <?php // CirconscriptionActions::echoCircoMap("full", 900, 0); ?>
@@ -12 +12 @@
 } ?>
 </div>
-<?php echo include_partial('circonscription/mapDeptmts', array()); ?>
+<?php CirconscriptionActions::echoDeptmtsMap(600, 546); ?>
 <div class="list_circo borderleft">
 <?php $ct = 0;

cpc/trunk/project/apps/frontend/modules/parlementaire/templates/_top.php

@@ -62 +62 @@
   $weeks = (strtotime($parlementaire->fin_mandat) - strtotime($parlementaire->debut_mandat))/(60*60*24*7);
   echo '<h2>';
-  printf('Bilan de ses %d semaines de mandat :</h2>', $weeks);
+  printf('Activité sur %d semaines :</h2>', $weeks);
  }
 ?>