WebSVN – eFlore/Projets.eflore-projets – Diff – /trunk/scripts/modules/osm/MiseAJour.php

 <?php
 /**
+ * Permet de mettre à jour les contours à partir d'un fichier de diff.
+ *
- * Exemple lancement:
+ * Exemple de lancement du script :
- * /opt/lampp/bin/php -d memory_limit=3500M /home/mohcen/web/cartoOSM/scripts/cli.php osm/mise_a_jour -a recupererRelationAMod
+ * /opt/lampp/bin/php -d memory_limit=3500M cli.php osm -a maj -f fichier_osm_change -e fichier_osm_nouveau
- * -f fichier_osm_change -e fichier_osm_nouveau
-*/
+ */
-class MiseAjour extends Script {
+class MiseAJour {
+	private $conteneur;
+	private $bdd;
+	private $messages;
+	private $mode;
 	private $communes = array();
 	private $relations_communes = array();
 	private $relation_a_chemins = array();
 	private $chemin_a_noeuds = array();
 	private $noeuds = array();
 	private $pas = 10000;
 	private $pas_commune = 1000;
+	private $elementType = '';
+	public function __construct($conteneur) {
+		$this->conteneur = $conteneur;
-	protected $parametres_autorises = array(
+		$this->bdd = $this->conteneur->getBdd();
+		$this->messages = $this->conteneur->getMessages();
+		$this->mode = $this->conteneur->getParametre('m');
+	}
+	/**
+	 * Fonction qui parcourt tous les ways les noeuds de chaque relation en prenant en considération l'ordre et
+	 * le sens de chaque ways concaténés ensemble (séparés par des virgules). Update du champ polygone de chaque
-	'-f' => array(true, null, 'Chemin du fichier osm à analyser'));
+	 * relation dans la table `osm_relations`
-	public function executer() {
-		$this->bdd = new Bdd();
+	 */
+	public function executer() {
 		// Lancement de l'action demandée
-		$cmd = $this->getParametre('a');
+		$cmd = $this->conteneur->getParametre('a');
-	    switch ($cmd) {
+		switch ($cmd) {
-			case 'MAJ' :
+			case 'maj' :
-				$this->MettreAjour();
+				$this->mettreAjour();
 				break;
+			default :
+				$msgTpl = "Erreur : la commande '%s' n'est pas prise en compte par la classe %s !";
-				default :
+				$msg = sprintf($msgTpl, $cmd, get_class($this));
-				$this->traiterErreur('Erreur : la commande "%s" n\'existe pas!', array($cmd));
+				throw new Exception($msg);
 		}
 		print "\n";// Pour ramener à la ligne en fin de script
+	}
 	/**
 	 * Fonction permettant de traiter et d'analyser le fichier de différence et de mettre  à jour la base de données
 	 * en tenant compte des trois cas:Suppression, Création ,modification
-	*/
-	private function MettreAjour() {
-		$lecteur = new XMLReader();
+	*/
-		if ($lecteur->open($this->getParametre('f'))) {
+	private function mettreAjour() {
-			$dom = new DomDocument();
-			while ($lecteur->read()) {
+		$lecteur = $this->getLecteurXml();
-				if ($lecteur->nodeType == XMLREADER::ELEMENT) {
+		while ($lecteur->read()) {
-					if ($lecteur->localName == 'create') {
+			if ($lecteur->nodeType == XMLREADER::ELEMENT) {
-						$creations = $lecteur->expand();
-						$this->	analyserCreations($creations);
-					}
-					if ($lecteur->localName == 'modify') {
+				$this->elementType = $lecteur->localName;
-						$modifications = $lecteur->expand();
+				$this->analyserElementXml($lecteur->localName, $lecteur->expand());
-						$this->	analyserModifications($modifications);
-					}
+			}
-					if ($lecteur->localName == 'delete') {
-						$suppressions = $lecteur->expand();
 						$this->	analyserSuppressions($suppressions);
-					}
-				}
-			}
-		} else {
+			if ($this->mode == 'manuel') {
-			$e = "Impossible d'ouvrir le fichier osm : %s";
+				$this->messages->afficherAvancement("Analyse de la ligne du fichier de diff OSM : ", 1);
+			}
+		}
+	}
+	private function getLecteurXml() {
+		$fichierOsm = $this->conteneur->getParametre('f');
+		$lecteur = new XMLReader();
+		$ouvertureXmlOk = $lecteur->open($fichierOsm);
-			$this->traiterErreur($e, array($this->getParametre('f')));
+		if ($ouvertureXmlOk === false) {
-		}
+			$msgTpl = "Impossible d'ouvrir le fichier osm : %s";
-	}
+			$msg = sprintf($msgTpl, $this->conteneur->getParametre('f'));
+			new Exception($msg);
+		}
-	/**
+		return $lecteur;
-	 * Fonction permettant le traitement du cas création concernant les relations, ways et les noeuds.
+	}
-	 */
-	private function analyserCreations($creations) {
-		$relations = $creations->getElementsByTagName('relation');
+	private function analyserElementXml($noeudDom) {
-		foreach ($relations as $relation) {
-			$this-> analyserRelation($relation);
-			if (count($this->relation_a_chemins) > $this->pas) {
+		$relations = $noeudDom->getElementsByTagName('relation');
-				$this->insererRelationAChemins();
+		if ($relations->length > 0) {
 			foreach ($relations as $relation) {
+				$this->analyserRelation($relation);
-			if (count($this->relations_communes) > $this->pas_commune) {
+				$this->traiterRelations();
+			}
-				$this->insererRelationsCommunes();
+		}
-			}
-		}
 		$ways = $creations->getElementsByTagName('way');
-		foreach ($ways as $way) {
+		if ($ways->length > 0) {
-			$this->analyserWay($way);
+			foreach ($ways as $way) {
+				$this->analyserWay($way);
-			if (count($this->chemin_a_noeuds) > $this->pas) {
+				$this->traiterCheminANoeuds();
+			}
-				$this->insererCheminANoeuds();
+		}
-			}
-		}
 		$noeuds = $creations->getElementsByTagName('node');
-		foreach ($noeuds as $noeud) {
+		if ($noeuds->length > 0) {
-			$this->analyserNode($noeud);
+			foreach ($noeuds as $noeud) {
-			if (count($this->noeuds) > $this->pas) {
+				$this->analyserNode($noeud);
-				$this->insererNoeuds();
+				$this->traiterNoeuds();
-			}
-		}
 		$this->insererRelationsCommunes();
-		$this->insererRelationAChemins();
-		$this->insererCheminANoeuds();
-		$this->insererNoeuds();
-	}
+		}
-	/**
+		$this->traiterElementsOrphelins();
+	}
-	 * Fonction permettant le traitement du cas modification concernant les relations, ways et les noeuds.
+	private function traiterRelations() {
-	 */
+		if (count($this->relation_a_chemins) > $this->pas) {
-	private function analyserModifications($modifications) {
+			switch ($this->elementType) {
-		$relations = $modifications->getElementsByTagName('relation');
+				case 'create' :
-		foreach ($relations as $relation) {
+					$this->insererRelationAChemins();
-			$this-> analyserRelation($relation);
+					break;
+				case 'modify' :
-			if (count($this->relation_a_chemins) > $this->pas) {
+					$this->modifierRelationAChemins();
-				$this->modifierRelationAChemins();
+					break;
-			}
+				case 'delete' :
-			if (count($this->relations_communes) > $this->pas_commune) {
+					$this->supprimerRelationAChemins();
+					break;
-				$this->modifierRelationsCommunes();
+			}
+		}
+		if (count($this->relations_communes) > $this->pas_commune) {
-			}
+			switch ($this->elementType) {
+				case 'create' :
+					$this->insererRelationsCommunes();
-		}
+					break;
+				case 'modify' :
-		$ways = $modifications->getElementsByTagName('way');
+					$this->modifierRelationsCommunes();
-		foreach ($ways as $way) {
+					break;
+				case 'delete' :
+					$this->supprimerRelationsCommunes();
+					break;
-			$this->analyserWay($way);
+			}
-			if (count($this->chemin_a_noeuds) > $this->pas) {
+		}
+	}
-				$this->modifierCheminANoeuds();
+	private function traiterChemins() {
+		if (count($this->chemin_a_noeuds) > $this->pas) {
-			}
+			switch ($this->elementType) {
+				case 'create' :
+					$this->insererCheminANoeuds();
-		}
+					break;
+				case 'modify' :
-		$noeuds = $modifications->getElementsByTagName('node');
+					$this->modifierCheminANoeuds();
-		foreach ($noeuds as $noeud) {
+					break;
-			$this->analyserNode($noeud);
-			if (count($this->noeuds) > $this->pas) {
-				$this->modifierNoeuds();
-			}
 				case 'delete' :
-		$this->modifierRelationsCommunes();
-		$this->modifierRelationAChemins();
+					$this->supprimerCheminANoeuds();
-		$this->modifierCheminANoeuds();
-		$this->modifierNoeuds();
+					break;
-	}
+			}
+		}
-	/**
+	}
-	 * Fonction permettant le traitement du cas suppression concernant les relations, ways et les noeuds.
+	private function traiterNoeuds() {
-	 */
+		if (count($this->noeuds) > $this->pas) {
-	private function analyserSuppressions($suppressions) {
+			switch ($this->elementType) {
-		$relations = $suppressions->getElementsByTagName('relation');
+				case 'create' :
-		foreach ($relations as $relation) {
+					$this->insererNoeuds();
+					break;
-			$this-> analyserRelation($relation);
+				case 'modify' :
-			if (count($this->relation_a_chemins) > $this->pas) {
+					$this->modifierNoeuds();
+					break;
+				case 'delete' :
-				$this->supprimerRelationAChemins();
+					$this->supprimerNoeuds();
-			}
+					break;
+			}
+		}
+	}
-			if (count($this->relations_communes) > $this->pas_commune) {
+	private function traiterElementsOrphelins() {
+		switch ($this->elementType) {
+			case 'create' :
+				$this->insererRelationsCommunes();
-				$this->supprimerRelationsCommunes();
+				$this->insererRelationAChemins();
+				$this->insererCheminANoeuds();
+				$this->insererNoeuds();
+				break;
+			case 'modify' :
+				$this->modifierRelationsCommunes();
+				$this->modifierRelationAChemins();
 				$this->modifierCheminANoeuds();
-		}
-		$ways = $suppressions->getElementsByTagName('way');
-		foreach ($ways as $way) {
-			$this->analyserWay($way);
-			if (count($this->chemin_a_noeuds) > $this->pas) {
-				$this->supprimerCheminANoeuds();
 				$this->modifierNoeuds();
-		}
+				break;
-		$noeuds = $suppressions->getElementsByTagName('node');
+			case 'delete' :
-		foreach ($noeuds as $noeud) {
-			$this->analyserNode($noeud);
-			if (count($this->noeuds) > $this->pas) {
-				$this->supprimerNoeuds();
 				$this->supprimerRelationsCommunes();
-		}
-		$this->supprimerRelationsCommunes();
+				$this->supprimerRelationAChemins();
-		$this->supprimerRelationAChemins();
+				$this->supprimerCheminANoeuds();
-		$this->supprimerCheminANoeuds();
+				$this->supprimerNoeuds();
-		$this->supprimerNoeuds();
+				break;
-	}
+		}
+	}
 	/**
 	 * Récupère l'id commune, nom commune et le code INSEE et remplie la table `osm_relations`
 	 */
 	private function analyserRelation($relation) {
-		$relation_id = $this->proteger($relation->getAttribute('id'));
+		$relation_id = $relation->getAttribute('id');
 		$chemins = $relation->getElementsByTagName('member');
+		foreach ($chemins as $chemin) {
+			if ($chemin->getAttribute('type') == 'way') { //écarter le noeud centrale
+				$chemin_id = $chemin->getAttribute('ref');
+				$role = $chemin->getAttribute('role');//role: null, inner, outer, exclave et enclave.
+				$this->relation_a_chemins[] = array($relation_id, $chemin_id, $role);
+			}
+		}
-		foreach ($chemins as $chemin) {
+		$tags = $relation->getElementsByTagName('tag');
-			if ($chemin->getAttribute('type') == 'way') { //écarter le noeud centrale
+		if ($tags->length > 0) {
-				$chemin_id = $this->proteger($chemin->getAttribute('ref'));
-				$role = $this->proteger($chemin->getAttribute('role'));//role: null, inner, outer, exclave et enclave.
+			$this->analyserTags($relation_id, $tags);
 				$this->relation_a_chemins[] = array($relation_id, $chemin_id, $role);
+	}
-		$commune_nom = null;
+	private function analyserTags($relation_id, $tags) {
-		$commune_insee = null;
+		$commune_nom = null;
-		$tags = $relation->getElementsByTagName('tag');
+		$commune_insee = null;
 		foreach ($tags as $tag) {
 			$tag_cle = $tag->getAttribute('k');
 			$tag_val = $tag->getAttribute('v');
 			switch ($tag_cle) {
 				case 'name' :
-					$commune_nom = $this->proteger($tag_val);
+					$commune_nom = $tag_val;
 					break;
 	/**
 	 * Récupère l'id_way et tous les id_node de chaque way et remplie la table `osm_chemin_a_noeuds`
 	 */
 	private function analyserWay($way) {
-		$chemin_id = $this->proteger($way->getAttribute('id'));
-		$ordre = 0;
+		$chemin_id = $way->getAttribute('id');
 		$noeuds = $way->getElementsByTagName('nd');
-		$chemin_a_noeuds = array();
+		$ordre = 0;
 		foreach ($noeuds as $noeud) {
-			$noeud_id = $this->proteger($noeud->getAttribute('ref'));
-			$ordre++;
+			$noeud_id = $noeud->getAttribute('ref');
-	    	$this->chemin_a_noeuds[] = array($chemin_id, $noeud_id, $ordre);
+			$this->chemin_a_noeuds[] = array($chemin_id, $noeud_id, ++$ordre);
+		}
+	}
 	/**
 	 * Fonction qui récupère tous les l'id_node et les valeurs(Lat/Lon) correspondantes et remplie la table `osm_noeuds`
 	 */
 	private function analyserNode($node) {
-		$noeud_id = $this->proteger($node->getAttribute('id'));
+		$this->noeuds[] = array(
-		$lat = $this->proteger($node->getAttribute('lat'));
+			$node->getAttribute('id'),
+			$node->getAttribute('lat'),
-		$lon = $this->proteger($node->getAttribute('lon'));
+			$node->getAttribute('lon')
-		$this->noeuds[] = array($noeud_id, $lat, $lon);
+		);
+	}
 	//Insertion des relations
+	private function insererRelationsCommunes() {
-	private function insererRelationsCommunes() {
+		$requete = 'INSERT INTO osm_relations (id_relation, nom, code_insee) '.
-		$requete =	'INSERT INTO osm_relations (id_relation, nom, code_insee) '.
+			'VALUES '.$this->creerValuesMultiple($this->relations_communes).
-					'VALUES '.$this->creerValuesMultiple($this->relations_communes);
+			' -- '.__FILE__.' : '.__LINE__;
-		$this->inserer($requete);
+		$this->bdd->requeter($requete);
 		$this->relations_communes = array();
 	}
+	//Insertion des relations à chemins
-	//Insertion des relations à chemins
+	private function insererRelationAChemins() {
-	private function insererRelationAChemins() {
+		$requete = 'INSERT INTO osm_relation_a_chemins (id_relation, id_chemin, role) '.
-		$requete =	'INSERT INTO osm_relation_a_chemins (id_relation, id_chemin, role) '.
+			'VALUES '.$this->creerValuesMultiple($this->relation_a_chemins).
-					'VALUES '.$this->creerValuesMultiple($this->relation_a_chemins);
+			' -- '.__FILE__.' : '.__LINE__;
-		$this->inserer($requete);
+		$this->bdd->requeter($requete);
 		$this->relation_a_chemins = array();
 	}
+	//Insertion des chemins à noeuds
-	//Insertion des chemins à noeuds
+	private function insererCheminANoeuds() {
-	private function insererCheminANoeuds() {
+		$requete = 'INSERT INTO osm_chemin_a_noeuds (id_chemin, id_noeud, ordre) '.
-		$requete = 	'INSERT INTO osm_chemin_a_noeuds (id_chemin, id_noeud, ordre) '.
+			'VALUES '.$this->creerValuesMultiple($this->chemin_a_noeuds).
-					'VALUES '.$this->creerValuesMultiple($this->chemin_a_noeuds);
+			' -- '.__FILE__.' : '.__LINE__;
-		$this->inserer($requete);
+		$this->bdd->requeter($requete);
 		$this->chemin_a_noeuds = array();
+	}
-	}
 	//Insertion des noeuds
-	//Insertion des noeuds
+	private function insererNoeuds() {
-	private function insererNoeuds() {
+		$requete = 'INSERT INTO osm_noeuds (id_noeud, lat, `long`) '.
-		$requete = 'INSERT INTO osm_noeuds (id_noeud, lat, `long`) '.
+			'VALUES '.$this->creerValuesMultiple($this->noeuds).
-	    		   'VALUES '.$this->creerValuesMultiple($this->noeuds);
+			' -- '.__FILE__.' : '.__LINE__;
-		$this->inserer($requete);
+		$this->bdd->requeter($requete);
 		$this->noeuds = array();
 	}
+	//Update des relations
-	//Update des relations
+	private function modifierRelationsCommunes() {
-	private function modifierRelationsCommunes() {
+		foreach ($this->relations_communes as $donnee) {
-		$donnees = $this->relations_communes;
+			$infosP = $this->bdd->proteger($donnee);
-		foreach ($donnees as $donnee) {
+			$requete = 'UPDATE osm_relations '.
-		$requete = 'UPDATE osm_relations '.
+				"SET id_relation = $infosP[0], nom = $infosP[1], code_insee = $infosP[2] ".
-					"SET id_relation = $donnee[0], nom = $donnee[1], code_insee = $donnee[2] ".
+				"WHERE id_relation = $infosP[0] ".
-					"WHERE id_relation = $donnee[0]";
+				' -- '.__FILE__.' : '.__LINE__;
-			$this->inserer($requete);
+			$this->bdd->requeter($requete);
+		}
-		$this->relations_communes = array();
-	}
+		$this->relations_communes = array();
+	}
-	/*
-	*Update des relations à chemins en supprimant l'ancienne relation et tous ses chemins
-	*de la table osm_relation_a_chemins et insérer la nouvelle
-	*/
-	private function modifierRelationAChemins() {
-		$relations_a_chemins_a_supp = array();
-		$donnees = $this->relation_a_chemins;
-		foreach ($donnees as $donnee) {
+	/*
-			$relations_a_chemins_a_supp[] = $donnee[0];
+	*Update des relations à chemins en supprimant l'ancienne relation et tous ses chemins
+	*de la table osm_relation_a_chemins et insérer la nouvelle
-		}
+	*/
-		$values_chaine = '('.implode(',',array_unique($relations_a_chemins_a_supp)).')';
+	private function modifierRelationAChemins() {
-		$requete = 'DELETE FROM osm_relation_a_chemins '.
+		$this->supprimerRelationAChemins();
-					"WHERE id_relation IN $values_chaine";
+		foreach ($this->relation_a_chemins as $donnee) {
-		$this->inserer($requete);
+			$infosP = $this->bdd->proteger($donnee);
-		foreach ($donnees as $donnee) {
+			$requete = 'INSERT INTO osm_relation_a_chemins (id_relation, id_chemin, role) '.
-			$requete = 'INSERT INTO osm_relation_a_chemins (id_relation, id_chemin, role) '.
+				"VALUES ($infosP[0], $infosP[1], $infosP[2]) ".
-						"VALUES ($donnee[0], $donnee[1], $donnee[2]);";
+				' -- '.__FILE__.' : '.__LINE__;
-			$this->inserer($requete);
+			$this->bdd->requeter($requete);
-		}
-		$this->relation_a_chemins = array();
+		}
-	}
+		$this->relation_a_chemins = array();
-	/*
-	*Update des chemins à noeuds en supprimant l'ancien chemin et tous ses noeuds
-	*de la table osm_chemins_a_noeuds et insérer le nouveau
-	*/
-	private function modifierCheminANoeuds() {
+	}
-		$chemin_a_noeuds_a_supp = array();
 		$donnees = $this->chemin_a_noeuds;
-		foreach ($donnees as $donnee) {
+	/*
+	*Update des chemins à noeuds en supprimant l'ancien chemin et tous ses noeuds
-			$chemin_a_noeuds_a_supp[] = $donnee[0];
+	*de la table osm_chemins_a_noeuds et insérer le nouveau
 	*/
-		$values_chaine = '('.implode(',',array_unique($chemin_a_noeuds_a_supp)).')';
+	private function modifierCheminANoeuds() {
-		$requete = 'DELETE FROM osm_chemin_a_noeuds '.
+		$this->supprimerCheminANoeuds();
-					"WHERE id_chemin IN $values_chaine";
-		$this->inserer($requete);
+		foreach ($this->chemin_a_noeuds as $donnee) {
-		foreach ($donnees as $donnee) {
+			$infosP = $this->bdd->proteger($donnee);
 			$requete = 'INSERT INTO osm_chemin_a_noeuds (id_chemin, id_noeud, ordre) '.
-						"VALUES ($donnee[0], $donnee[1], $donnee[2]);";
+				"VALUES ($infosP[0], $infosP[1], $infosP[2]) ".
-			$this->inserer($requete);
+				' -- '.__FILE__.' : '.__LINE__;
-		}
+			$this->bdd->requeter($requete);
-		$this->chemin_a_noeuds = array();
+		}
+		$this->chemin_a_noeuds = array();
 	}
 	//Update des noeuds
-	//Update des noeuds
+	private function modifierNoeuds() {
-	private function modifierNoeuds() {
-		$donnees = $this->noeuds;
+		foreach ($this->noeuds as $donnee) {
-		foreach ($donnees as $donnee) {
+			$infosP = $this->bdd->proteger($donnee);
 			$requete = 'UPDATE osm_noeuds '.
-						"SET id_noeud = $donnee[0], lat = $donnee[1], `long` = $donnee[2] ".
-						"WHERE id_noeud = $donnee[0]";
-			$this->inserer($requete);
-		}
-		$this->noeuds = array();
 				"SET id_noeud = $infosP[0], lat = $infosP[1], `long` = $infosP[2] ".
+				"WHERE id_noeud = $infosP[0] ".
+				' -- '.__FILE__.' : '.__LINE__;
+			$this->bdd->requeter($requete);
+		}
 		$this->noeuds = array();
+	}
 	//Suppressions des relations
-	private function supprimerRelationsCommunes() {
-		$donnees = $this->relations_communes;
-		foreach ($donnees as $donnee) {
+	//Suppressions des relations
-			$requete = 'DELETE FROM osm_relations '.
-						"WHERE id_relation = $donnee[0]";
-			$this->inserer($requete);
-		}
-		$this->relations_communes = array();
+	private function supprimerRelationsCommunes() {
+		$idsIn = $this->getIds($this->relations_communes);
+		$this->relations_communes = array();
+		$requete = 'DELETE FROM osm_relations '.
+			"WHERE id_relation IN ($idsIn) ".
 			' -- '.__FILE__.' : '.__LINE__;
 		$this->bdd->requeter($requete);
 	//Suppressions des relations à chemins
-	private function supprimerRelationAChemins() {
-		$donnees = $this->relations_communes;
-		foreach ($donnees as $donnee) {
-			$donnees = $this->relation_a_chemins;
-			$requete = 'DELETE FROM osm_relation_a_chemins '.
-						"WHERE id_relation = $donnee[0]";
-			$this->inserer($requete);
 	//Suppressions des relations à chemins
+	private function supprimerRelationAChemins() {
+		$idsIn = $this->getIds($this->relation_a_chemins);
+		$this->relation_a_chemins = array();
+		$requete = 'DELETE FROM osm_relation_a_chemins '.
-		$this->relation_a_chemins = array();
+			"WHERE id_relation IN ($idsIn) ".
 			' -- '.__FILE__.' : '.__LINE__;
 		$this->bdd->requeter($requete);
-	//Suppressions des chemins à noeuds
+	}
-	private function supprimerCheminANoeuds() {
-		$donnees = $this->chemin_a_noeuds;
-		foreach ($donnees as $donnee) {
-			$donnees = $this->relation_a_chemins;
-			$requete = 'DELETE FROM osm_chemin_a_noeuds '.
 						"WHERE id_chemin = $donnee[0]";
-			$this->inserer($requete);
-		}
-		$this->chemin_a_noeuds = array();
+	//Suppressions des chemins à noeuds
+	private function supprimerCheminANoeuds() {
+		$idsIn = $this->getIds($this->chemin_a_noeuds);
 		$this->chemin_a_noeuds = array();
 		$requete = 'DELETE FROM osm_chemin_a_noeuds '.
-	//Suppressions des chemins à noeuds
+			"WHERE id_chemin IN ($idsIn) ".
+			' -- '.__FILE__.' : '.__LINE__;
+		$this->bdd->requeter($requete);
-	private function supprimerNoeuds() {
+	}
+	//Suppressions des chemins à noeuds
+	private function supprimerNoeuds() {
+		$idsIn = $this->getIds($this->noeuds);
-		$donnees = $this->noeuds;
+		$this->noeuds = array();
-		foreach ($donnees as $donnee) {
+		$requete = 'DELETE FROM osm_noeuds '.
-			$requete = 'DELETE FROM osm_noeuds '.
+			"WHERE id_noeud IN ($idsIn) ".
-						"WHERE id_noeud = $donnee[0]";
+			' -- '.__FILE__.' : '.__LINE__;
+		$this->bdd->requeter($requete);
-			$this->inserer($requete);
+	}
-		$this->noeuds = array();
+	private function getIds(&$tableau) {
-	}
+		$ids = array();
 		foreach ($tableau as $info) {
-	private function inserer($requete) {
+			$ids[] = $this->bdd->proteger($info[0]);
-		$this->bdd->requeter($requete);
+		}

Subversion Repositories eFlore/Projets.eflore-projets

(root)/trunk/scripts/modules/osm/MiseAJour.php @ 1060 – Rev 1038 → 1046