diff --git a/src/fmi/fmi2Functions.c b/src/fmi/fmi2Functions.c index abd0a2703fe9..3ffe39b16c76 100644 --- a/src/fmi/fmi2Functions.c +++ b/src/fmi/fmi2Functions.c @@ -55,7 +55,7 @@ const char* fmi2GetVersion(void) { fmi2Status fmi2SetDebugLogging(fmi2Component c, fmi2Boolean loggingOn, size_t nCategories, const fmi2String categories[]) { - ModelInstance *comp = (ModelInstance *)c; + ModelInstance* comp = (ModelInstance*)c; if (loggingOn) { size_t i; @@ -85,15 +85,14 @@ fmi2SetDebugLogging(fmi2Component c, fmi2Boolean loggingOn, size_t nCategories, failed.*/ fmi2Component fmi2Instantiate(fmi2String instanceName, fmi2Type fmuType, fmi2String fmuGUID, - fmi2String fmuResourceLocation, const fmi2CallbackFunctions *functions, - fmi2Boolean visible, fmi2Boolean loggingOn) -{ + fmi2String fmuResourceLocation, const fmi2CallbackFunctions* functions, + fmi2Boolean visible, fmi2Boolean loggingOn) { UNREFERENCED_PARAMETER(fmuType); UNREFERENCED_PARAMETER(fmuGUID); UNREFERENCED_PARAMETER(visible); allocateMemoryType funcAllocateMemory = (allocateMemoryType)functions->allocateMemory; - ModelInstance* comp = (ModelInstance *) funcAllocateMemory(1, sizeof(ModelInstance)); + ModelInstance* comp = (ModelInstance*) funcAllocateMemory(1, sizeof(ModelInstance)); if (comp) { comp->componentEnvironment = functions->componentEnvironment; @@ -105,12 +104,12 @@ fmi2Instantiate(fmi2String instanceName, fmi2Type fmuType, fmi2String fmuGUID, comp->allocateMemory = (allocateMemoryType)functions->allocateMemory; comp->freeMemory = (freeMemoryType)functions->freeMemory; - comp->instanceName = (char *)comp->allocateMemory(1 + strlen(instanceName), sizeof(char)); - strcpy((char *)comp->instanceName, (char *)instanceName); + comp->instanceName = (char*)comp->allocateMemory(1 + strlen(instanceName), sizeof(char)); + strcpy((char*)comp->instanceName, (char*)instanceName); if (fmuResourceLocation) { - comp->resourceLocation = (char *)comp->allocateMemory(1 + strlen(fmuResourceLocation), sizeof(char)); - strcpy((char *)comp->resourceLocation, (char *)fmuResourceLocation); + comp->resourceLocation = (char*)comp->allocateMemory(1 + strlen(fmuResourceLocation), sizeof(char)); + strcpy((char*)comp->resourceLocation, (char*)fmuResourceLocation); } else { comp->resourceLocation = NULL; } @@ -126,23 +125,23 @@ fmi2Instantiate(fmi2String instanceName, fmi2Type fmuType, fmi2String fmuGUID, and other resources that have been allocated by the functions of the FMU interface. */ void fmi2FreeInstance(fmi2Component c) { - ModelInstance *comp = (ModelInstance *)c; + ModelInstance* comp = (ModelInstance*)c; /* Store the pointer to the freeMemory function, because we are going to free comp as well */ freeMemoryType freeMemoryFunc = comp->freeMemory; /* We want to free everything that we allocated in fmi2Instantiate */ - freeMemoryFunc((void *)comp->instanceName); - freeMemoryFunc((void *)comp->resourceLocation); - freeMemoryFunc((void *)comp->libsumoCallOptions); - freeMemoryFunc((void *)comp->getterParameters); + freeMemoryFunc((void*)comp->instanceName); + freeMemoryFunc((void*)comp->resourceLocation); + freeMemoryFunc((void*)comp->libsumoCallOptions); + freeMemoryFunc((void*)comp->getterParameters); int i; for (i = 0; i < comp->bufferArrayLength; i++) { - freeMemoryFunc((void *)comp->bufferArray[i]); + freeMemoryFunc((void*)comp->bufferArray[i]); } - freeMemoryFunc((void *)comp->bufferArray); - freeMemoryFunc((void *)comp); + freeMemoryFunc((void*)comp->bufferArray); + freeMemoryFunc((void*)comp); } fmi2Status @@ -154,7 +153,7 @@ fmi2SetupExperiment(fmi2Component c, fmi2Boolean toleranceDefined, fmi2Real tole UNREFERENCED_PARAMETER(stopTimeDefined); // ignore arguments: toleranceDefined, tolerance - ModelInstance *comp = (ModelInstance *)c; + ModelInstance* comp = (ModelInstance*)c; // Store the start and stop times of the experiment comp->startTime = startTime; @@ -176,7 +175,7 @@ fmi2EnterInitializationMode(fmi2Component c) { // Informs the FMU to exit Initialization Mode fmi2Status fmi2ExitInitializationMode(fmi2Component c) { - ModelInstance *comp = (ModelInstance *)c; + ModelInstance* comp = (ModelInstance*)c; sumo2fmi_logEvent(comp, "Calling libsumo with the following options: \"%s\"", comp->libsumoCallOptions); libsumo_load(comp->libsumoCallOptions); @@ -217,7 +216,7 @@ fmi2GetReal(fmi2Component c, const fmi2ValueReference vr[], size_t nvr, fmi2Real fmi2Status fmi2GetInteger(fmi2Component c, const fmi2ValueReference vr[], size_t nvr, fmi2Integer value[]) { - ModelInstance *comp = (ModelInstance *)c; + ModelInstance* comp = (ModelInstance*)c; // Check for null pointer errors if (nvr > 0 && (!vr || !value)) { @@ -253,7 +252,7 @@ fmi2GetBoolean(fmi2Component c, const fmi2ValueReference vr[], size_t nvr, fmi2B fmi2Status fmi2GetString(fmi2Component c, const fmi2ValueReference vr[], size_t nvr, fmi2String value[]) { - ModelInstance *comp = (ModelInstance *)c; + ModelInstance* comp = (ModelInstance*)c; // Check for null pointer errors if (nvr > 0 && (!vr || !value)) { @@ -265,10 +264,10 @@ fmi2GetString(fmi2Component c, const fmi2ValueReference vr[], size_t nvr, fmi2St /** Clear value array buffer before reuse */ int b; for (b = 0; b < comp->bufferArrayLength; b++) { - comp->freeMemory((void *)comp->bufferArray[b]); + comp->freeMemory((void*)comp->bufferArray[b]); } - comp->freeMemory((void *)comp->bufferArray); - comp->bufferArray = (fmi2String *)comp->allocateMemory(nvr, sizeof(fmi2String)); + comp->freeMemory((void*)comp->bufferArray); + comp->bufferArray = (fmi2String*)comp->allocateMemory(nvr, sizeof(fmi2String)); comp->bufferArrayLength = (int)nvr; // Go through the list of arrays and save all requested values @@ -322,14 +321,16 @@ fmi2SetBoolean(fmi2Component c, const fmi2ValueReference vr[], size_t nvr, const fmi2Status fmi2SetString(fmi2Component c, const fmi2ValueReference vr[], size_t nvr, const fmi2String value[]) { - ModelInstance *comp = (ModelInstance *)c; + ModelInstance* comp = (ModelInstance*)c; fmi2Status status = fmi2OK; size_t i; for (i = 0; i < nvr; i++) { fmi2Status s = sumo2fmi_setString(comp, vr[i], value[i]); status = s > status ? s : status; - if (status > fmi2Warning) return status; + if (status > fmi2Warning) { + return status; + } } return status; @@ -425,7 +426,7 @@ fmi2Status fmi2DoStep(fmi2Component c, fmi2Real currentCommunicationPoint, fmi2Real communicationStepSize, fmi2Boolean noSetFMUStatePriorToCurrentPoint) { UNREFERENCED_PARAMETER(noSetFMUStatePriorToCurrentPoint); - ModelInstance *comp = (ModelInstance *)c; + ModelInstance* comp = (ModelInstance*)c; if (communicationStepSize <= 0) { return fmi2Error; @@ -443,7 +444,7 @@ fmi2CancelStep(fmi2Component c) { /* Status functions */ fmi2Status -fmi2GetStatus(fmi2Component c, const fmi2StatusKind s, fmi2Status *value) { +fmi2GetStatus(fmi2Component c, const fmi2StatusKind s, fmi2Status* value) { UNREFERENCED_PARAMETER(c); UNREFERENCED_PARAMETER(s); UNREFERENCED_PARAMETER(value); @@ -452,7 +453,7 @@ fmi2GetStatus(fmi2Component c, const fmi2StatusKind s, fmi2Status *value) { } fmi2Status -fmi2GetRealStatus(fmi2Component c, const fmi2StatusKind s, fmi2Real *value) { +fmi2GetRealStatus(fmi2Component c, const fmi2StatusKind s, fmi2Real* value) { UNREFERENCED_PARAMETER(c); UNREFERENCED_PARAMETER(s); UNREFERENCED_PARAMETER(value); @@ -461,7 +462,7 @@ fmi2GetRealStatus(fmi2Component c, const fmi2StatusKind s, fmi2Real *value) { } fmi2Status -fmi2GetIntegerStatus(fmi2Component c, const fmi2StatusKind s, fmi2Integer *value) { +fmi2GetIntegerStatus(fmi2Component c, const fmi2StatusKind s, fmi2Integer* value) { UNREFERENCED_PARAMETER(c); UNREFERENCED_PARAMETER(s); UNREFERENCED_PARAMETER(value); @@ -470,7 +471,7 @@ fmi2GetIntegerStatus(fmi2Component c, const fmi2StatusKind s, fmi2Integer *value } fmi2Status -fmi2GetBooleanStatus(fmi2Component c, const fmi2StatusKind s, fmi2Boolean *value) { +fmi2GetBooleanStatus(fmi2Component c, const fmi2StatusKind s, fmi2Boolean* value) { UNREFERENCED_PARAMETER(c); UNREFERENCED_PARAMETER(s); UNREFERENCED_PARAMETER(value); @@ -479,7 +480,7 @@ fmi2GetBooleanStatus(fmi2Component c, const fmi2StatusKind s, fmi2Boolean *value } fmi2Status -fmi2GetStringStatus(fmi2Component c, const fmi2StatusKind s, fmi2String *value) { +fmi2GetStringStatus(fmi2Component c, const fmi2StatusKind s, fmi2String* value) { UNREFERENCED_PARAMETER(c); UNREFERENCED_PARAMETER(s); UNREFERENCED_PARAMETER(value); diff --git a/src/fmi/sumo2fmi_bridge.c b/src/fmi/sumo2fmi_bridge.c index 5f4f4d417451..9cdcf0e497e3 100644 --- a/src/fmi/sumo2fmi_bridge.c +++ b/src/fmi/sumo2fmi_bridge.c @@ -37,7 +37,7 @@ #define BUFFER_SIZE 256 void -sumo2fmi_set_startValues(ModelInstance *comp) { +sumo2fmi_set_startValues(ModelInstance* comp) { char sumoHomePath[BUFFER_SIZE]; /* check if $SUMO_HOME exists */ if (!getenv("SUMO_HOME")) { @@ -54,12 +54,12 @@ sumo2fmi_set_startValues(ModelInstance *comp) { char defaultCallOptions[BUFFER_SIZE * 2]; snprintf(defaultCallOptions, BUFFER_SIZE * 2, "-c %s/tools/game/grid6.sumocfg", sumoHomePath); - comp->libsumoCallOptions = (char *)comp->allocateMemory(1 + strlen(defaultCallOptions), sizeof(char)); - strcpy((char *)comp->libsumoCallOptions, (char *)defaultCallOptions); + comp->libsumoCallOptions = (char*)comp->allocateMemory(1 + strlen(defaultCallOptions), sizeof(char)); + strcpy((char*)comp->libsumoCallOptions, (char*)defaultCallOptions); } void -sumo2fmi_logEvent(ModelInstance *comp, const char *message, ...) { +sumo2fmi_logEvent(ModelInstance* comp, const char* message, ...) { if (!comp->logEvents) { return; } @@ -71,7 +71,7 @@ sumo2fmi_logEvent(ModelInstance *comp, const char *message, ...) { } void -sumo2fmi_logError(ModelInstance *comp, const char *message, ...) { +sumo2fmi_logError(ModelInstance* comp, const char* message, ...) { if (!comp->logErrors) { return; } @@ -83,10 +83,10 @@ sumo2fmi_logError(ModelInstance *comp, const char *message, ...) { } void -sumo2fmi_logMessage(ModelInstance *comp, int status, const char *category, const char *message, va_list args) { +sumo2fmi_logMessage(ModelInstance* comp, int status, const char* category, const char* message, va_list args) { va_list args1; size_t len = 0; - char *buf = ""; + char* buf = ""; va_copy(args1, args); len = vsnprintf(buf, len, message, args1); @@ -117,7 +117,7 @@ sumo2fmi_getInteger(ModelInstance* comp, const fmi2ValueReference vr, int* value } fmi2Status -sumo2fmi_getString(ModelInstance *comp, const fmi2ValueReference vr, fmi2String *value) { +sumo2fmi_getString(ModelInstance* comp, const fmi2ValueReference vr, fmi2String* value) { switch (vr) { case 0: *value = comp->libsumoCallOptions; @@ -144,12 +144,12 @@ sumo2fmi_setString(ModelInstance* comp, fmi2ValueReference vr, fmi2String value) switch (vr) { case 0: comp->freeMemory(comp->libsumoCallOptions); - comp->libsumoCallOptions = (char *)comp->allocateMemory(1 + strlen(value), sizeof(char)); + comp->libsumoCallOptions = (char*)comp->allocateMemory(1 + strlen(value), sizeof(char)); strcpy(comp->libsumoCallOptions, value); return fmi2OK; case 1: comp->freeMemory(comp->getterParameters); - comp->getterParameters = (char *)comp->allocateMemory(1 + strlen(value), sizeof(char)); + comp->getterParameters = (char*)comp->allocateMemory(1 + strlen(value), sizeof(char)); strcpy(comp->getterParameters, value); return fmi2OK; case 3: @@ -161,7 +161,7 @@ sumo2fmi_setString(ModelInstance* comp, fmi2ValueReference vr, fmi2String value) } fmi2Status -sumo2fmi_step(ModelInstance *comp, double tNext) { +sumo2fmi_step(ModelInstance* comp, double tNext) { UNREFERENCED_PARAMETER(comp); libsumo_step(tNext); diff --git a/src/libsumo/Person.cpp b/src/libsumo/Person.cpp index 0577d5324d00..c080c4b096fc 100644 --- a/src/libsumo/Person.cpp +++ b/src/libsumo/Person.cpp @@ -285,8 +285,7 @@ Person::getStage(const std::string& personID, int nextStageIndex) { result.travelTime = INVALID_DOUBLE_VALUE; if (stage->getArrived() >= 0) { result.travelTime = STEPS2TIME(stage->getArrived() - stage->getDeparted()); - } - else if (stage->getDeparted() >= 0) { + } else if (stage->getDeparted() >= 0) { result.travelTime = STEPS2TIME(SIMSTEP - stage->getDeparted()); } diff --git a/src/mesosim/MEVehicle.h b/src/mesosim/MEVehicle.h index ecd5c8a5201c..13496882fb72 100644 --- a/src/mesosim/MEVehicle.h +++ b/src/mesosim/MEVehicle.h @@ -268,7 +268,7 @@ class MEVehicle : public MSBaseVehicle { /// @brief Returns the duration for which the vehicle was blocked - inline SUMOTime getWaitingTime(const bool accumulated=false) const { + inline SUMOTime getWaitingTime(const bool accumulated = false) const { UNUSED_PARAMETER(accumulated); return MAX2(SUMOTime(0), myEventTime - myBlockTime); } diff --git a/src/microsim/MSVehicle.h b/src/microsim/MSVehicle.h index e77d25df28c3..19cf26d5ba55 100644 --- a/src/microsim/MSVehicle.h +++ b/src/microsim/MSVehicle.h @@ -670,7 +670,7 @@ class MSVehicle : public MSBaseVehicle { * If accumulated is true the time is aggregated over a configurable interval. * @return The time the vehicle is standing */ - SUMOTime getWaitingTime(const bool accumulated=false) const { + SUMOTime getWaitingTime(const bool accumulated = false) const { if (!accumulated) { return myWaitingTime; } diff --git a/src/microsim/devices/MSRoutingEngine.h b/src/microsim/devices/MSRoutingEngine.h index f041c0b4af4d..4bf727fe552c 100644 --- a/src/microsim/devices/MSRoutingEngine.h +++ b/src/microsim/devices/MSRoutingEngine.h @@ -97,8 +97,8 @@ class MSRoutingEngine { /// @brief return the vehicle router instance static MSVehicleRouter& getRouterTT(const int rngIndex, - SUMOVehicleClass svc, - const MSEdgeVector& prohibited = MSEdgeVector()); + SUMOVehicleClass svc, + const MSEdgeVector& prohibited = MSEdgeVector()); /// @brief return the person router instance static MSTransportableRouter& getIntermodalRouterTT(const int rngIndex, diff --git a/src/microsim/transportables/MSPModel_JuPedSim.cpp b/src/microsim/transportables/MSPModel_JuPedSim.cpp index 548c4c24901f..fcfcff64f8c2 100644 --- a/src/microsim/transportables/MSPModel_JuPedSim.cpp +++ b/src/microsim/transportables/MSPModel_JuPedSim.cpp @@ -431,7 +431,7 @@ MSPModel_JuPedSim::createGeometryFromShape(PositionVector shape, std::string sha cleanShape.push_back(shape[0]); PositionVector duplicates; for (int i = 1; i < (int)shape.size(); i++) { - if (shape[i] != shape[i-1]) { + if (shape[i] != shape[i - 1]) { cleanShape.push_back(shape[i]); } else { duplicates.push_back(shape[i]); @@ -772,7 +772,7 @@ MSPModel_JuPedSim::initialize() { } if (nbrConnectedComponents > 1) { WRITE_WARNINGF(TL("While generating geometry % connected components were detected, %% of total pedestrian area is covered by the first."), - nbrConnectedComponents, maxArea/totalArea*100.0, "%"); + nbrConnectedComponents, maxArea / totalArea * 100.0, "%"); } #ifdef DEBUG_GEOMETRY_GENERATION dumpGeometry(maxAreaConnectedComponentPolygon, "pedestrianNetwork.wkt"); diff --git a/src/microsim/transportables/MSPerson.cpp b/src/microsim/transportables/MSPerson.cpp index e26b5f3a1760..c217c4af248b 100644 --- a/src/microsim/transportables/MSPerson.cpp +++ b/src/microsim/transportables/MSPerson.cpp @@ -182,7 +182,7 @@ MSPerson::checkAccess(const MSStage* const prior, const bool waitAtStop) { } } newStage = new MSPersonStage_Access(accessEdge, prevStop, arrivalPos, access->length, true, - trainExit, platformEntry); + trainExit, platformEntry); } myStep = myPlan->insert(myStep, newStage); return true; diff --git a/src/microsim/transportables/MSStageDriving.cpp b/src/microsim/transportables/MSStageDriving.cpp index a40d05038a08..bdd793df7386 100644 --- a/src/microsim/transportables/MSStageDriving.cpp +++ b/src/microsim/transportables/MSStageDriving.cpp @@ -71,8 +71,8 @@ MSStageDriving::MSStageDriving(const MSEdge* origin, const MSEdge* destination, MSStage* MSStageDriving::clone() const { MSStage* const clon = new MSStageDriving(myOrigin, myDestination, myDestinationStop, myArrivalPos, - std::vector(myLines.begin(), myLines.end()), - myGroup, myIntendedVehicleID, myIntendedDepart); + std::vector(myLines.begin(), myLines.end()), + myGroup, myIntendedVehicleID, myIntendedDepart); clon->setParameters(*this); return clon; } @@ -434,7 +434,7 @@ MSStageDriving::setArrived(MSNet* net, MSTransportable* transportable, SUMOTime const double totalLength = myVehicle->getVehicleType().getLength(); const int numCarriages = MAX2(1, 1 + (int)((totalLength - pars.locomotiveLength) / (pars.carriageLength + pars.carriageGap) + 0.5)); const int firstPassengerCarriage = numCarriages == 1 - || (myVehicle->getVClass() & (SVC_RAIL_ELECTRIC | SVC_RAIL_FAST | SVC_RAIL)) == 0 ? 0 : 1; + || (myVehicle->getVClass() & (SVC_RAIL_ELECTRIC | SVC_RAIL_FAST | SVC_RAIL)) == 0 ? 0 : 1; const int randomCarriage = RandHelper::rand(numCarriages - firstPassengerCarriage) + firstPassengerCarriage; const double positionOnLane = myVehicle->getPositionOnLane(); if (randomCarriage == 0) { diff --git a/src/microsim/transportables/MSStageMoving.h b/src/microsim/transportables/MSStageMoving.h index 10d8376ca2c5..e6b224c36a0e 100644 --- a/src/microsim/transportables/MSStageMoving.h +++ b/src/microsim/transportables/MSStageMoving.h @@ -96,7 +96,7 @@ class MSStageMoving : public MSStage { virtual bool moveToNextEdge(MSTransportable* transportable, SUMOTime currentTime, int prevDir, MSEdge* nextInternal = 0) = 0; /// @brief add the move reminders for the current lane on entry - virtual void activateEntryReminders(MSTransportable* person, const bool isDepart=false) { + virtual void activateEntryReminders(MSTransportable* person, const bool isDepart = false) { UNUSED_PARAMETER(person); UNUSED_PARAMETER(isDepart); } diff --git a/src/microsim/transportables/MSStageWaiting.cpp b/src/microsim/transportables/MSStageWaiting.cpp index e4e3437f9c84..5c8770e38eb4 100644 --- a/src/microsim/transportables/MSStageWaiting.cpp +++ b/src/microsim/transportables/MSStageWaiting.cpp @@ -54,7 +54,7 @@ MSStageWaiting::~MSStageWaiting() {} MSStage* MSStageWaiting::clone() const { MSStage* const clon = new MSStageWaiting(myDestination, myDestinationStop, myWaitingDuration, myWaitingUntil, myArrivalPos, - myActType, myType == MSStageType::WAITING_FOR_DEPART); + myActType, myType == MSStageType::WAITING_FOR_DEPART); clon->setParameters(*this); return clon; } diff --git a/src/microsim/transportables/MSStageWalking.cpp b/src/microsim/transportables/MSStageWalking.cpp index 64d34058e1b5..0764da8d2d2e 100644 --- a/src/microsim/transportables/MSStageWalking.cpp +++ b/src/microsim/transportables/MSStageWalking.cpp @@ -59,11 +59,11 @@ bool MSStageWalking::myWarnedInvalidTripinfo = false; // method definitions // =========================================================================== MSStageWalking::MSStageWalking(const std::string& personID, - const ConstMSEdgeVector& route, - MSStoppingPlace* toStop, - SUMOTime walkingTime, double speed, - double departPos, double arrivalPos, double departPosLat, int departLane, - const std::string& routeID) : + const ConstMSEdgeVector& route, + MSStoppingPlace* toStop, + SUMOTime walkingTime, double speed, + double departPos, double arrivalPos, double departPosLat, int departLane, + const std::string& routeID) : MSStageMoving(route, routeID, toStop, speed, departPos, arrivalPos, departPosLat, departLane, MSStageType::WALKING), myWalkingTime(walkingTime), myExitTimes(nullptr), diff --git a/src/microsim/transportables/MSStageWalking.h b/src/microsim/transportables/MSStageWalking.h index 13457c0e18db..3fb169dd6ea7 100644 --- a/src/microsim/transportables/MSStageWalking.h +++ b/src/microsim/transportables/MSStageWalking.h @@ -115,7 +115,7 @@ class MSStageWalking : public MSStageMoving { /// @brief move forward and return whether the person arrived bool moveToNextEdge(MSTransportable* person, SUMOTime currentTime, int prevDir, MSEdge* nextInternal = nullptr); - void activateEntryReminders(MSTransportable* person, const bool isDepart=false); + void activateEntryReminders(MSTransportable* person, const bool isDepart = false); void activateLeaveReminders(MSTransportable* person, const MSLane* lane, double lastPos, SUMOTime t, bool arrived); diff --git a/src/microsim/transportables/MSTransportable.h b/src/microsim/transportables/MSTransportable.h index 4c23226a8511..e62ccd183945 100644 --- a/src/microsim/transportables/MSTransportable.h +++ b/src/microsim/transportables/MSTransportable.h @@ -94,7 +94,7 @@ class MSTransportable : public SUMOTrafficObject { */ double getMaxSpeed() const; - SUMOTime getWaitingTime(const bool accumulated=false) const; + SUMOTime getWaitingTime(const bool accumulated = false) const; double getPreviousSpeed() const { return getSpeed(); diff --git a/src/microsim/trigger/MSTriggeredRerouter.cpp b/src/microsim/trigger/MSTriggeredRerouter.cpp index 4d672981e677..b2fa999145c1 100644 --- a/src/microsim/trigger/MSTriggeredRerouter.cpp +++ b/src/microsim/trigger/MSTriggeredRerouter.cpp @@ -534,8 +534,8 @@ MSTriggeredRerouter::triggerRouting(SUMOTrafficObject& tObject, MSMoveReminder:: if (tObject.isVehicle()) { SUMOVehicle& veh = static_cast(tObject); MSVehicleRouter& router = hasReroutingDevice - ? MSRoutingEngine::getRouterTT(veh.getRNGIndex(), veh.getVClass(), rerouteDef->closed) - : MSNet::getInstance()->getRouterTT(veh.getRNGIndex(), rerouteDef->closed); + ? MSRoutingEngine::getRouterTT(veh.getRNGIndex(), veh.getVClass(), rerouteDef->closed) + : MSNet::getInstance()->getRouterTT(veh.getRNGIndex(), rerouteDef->closed); router.compute(veh.getEdge(), newEdge, &veh, now, edges); if (edges.size() == 0 && !keepDestination && rerouteDef->edgeProbs.getOverallProb() > 0) { // destination unreachable due to closed intermediate edges. pick among alternative targets @@ -564,9 +564,9 @@ MSTriggeredRerouter::triggerRouting(SUMOTrafficObject& tObject, MSMoveReminder:: const bool useNewRoute = veh.replaceRouteEdges(edges, routeCost, 0, getID()); #ifdef DEBUG_REROUTER if (DEBUGCOND) std::cout << " rerouting: newDest=" << newEdge->getID() - << " newEdges=" << toString(edges) - << " useNewRoute=" << useNewRoute << " newArrivalPos=" << newArrivalPos << " numClosed=" << rerouteDef->closed.size() - << " destUnreachable=" << destUnreachable << " containsClosed=" << veh.getRoute().containsAnyOf(rerouteDef->closed) << "\n"; + << " newEdges=" << toString(edges) + << " useNewRoute=" << useNewRoute << " newArrivalPos=" << newArrivalPos << " numClosed=" << rerouteDef->closed.size() + << " destUnreachable=" << destUnreachable << " containsClosed=" << veh.getRoute().containsAnyOf(rerouteDef->closed) << "\n"; #endif if (useNewRoute && newArrivalPos != -1) { // must be called here because replaceRouteEdges may also set the arrivalPos @@ -577,8 +577,8 @@ MSTriggeredRerouter::triggerRouting(SUMOTrafficObject& tObject, MSMoveReminder:: } else { // person rerouting here MSTransportableRouter& router = hasReroutingDevice - ? MSRoutingEngine::getIntermodalRouterTT(tObject.getRNGIndex(), rerouteDef->closed) - : MSNet::getInstance()->getIntermodalRouter(tObject.getRNGIndex(), 0, rerouteDef->closed); + ? MSRoutingEngine::getIntermodalRouterTT(tObject.getRNGIndex(), rerouteDef->closed) + : MSNet::getInstance()->getIntermodalRouter(tObject.getRNGIndex(), 0, rerouteDef->closed); const bool success = router.compute(tObject.getEdge(), newEdge, tObject.getPositionOnLane(), "", rerouteDef->isVia ? newEdge->getLength() / 2. : tObject.getParameter().arrivalPos, "", tObject.getMaxSpeed(), nullptr, 0, now, items); @@ -608,20 +608,20 @@ MSTriggeredRerouter::triggerRouting(SUMOTrafficObject& tObject, MSMoveReminder:: edges.pop_back(); } MSVehicleRouter& router = hasReroutingDevice - ? MSRoutingEngine::getRouterTT(veh.getRNGIndex(), veh.getVClass(), rerouteDef->closed) - : MSNet::getInstance()->getRouterTT(veh.getRNGIndex(), rerouteDef->closed); + ? MSRoutingEngine::getRouterTT(veh.getRNGIndex(), veh.getVClass(), rerouteDef->closed) + : MSNet::getInstance()->getRouterTT(veh.getRNGIndex(), rerouteDef->closed); router.compute(newEdge, lastEdge, &veh, now, edges); const double routeCost = router.recomputeCosts(edges, &veh, now); hasReroutingDevice ? MSRoutingEngine::getRouterTT(veh.getRNGIndex(), veh.getVClass()) : MSNet::getInstance()->getRouterTT(veh.getRNGIndex()); // reset closed edges const bool useNewRoute = veh.replaceRouteEdges(edges, routeCost, 0, getID()); - #ifdef DEBUG_REROUTER +#ifdef DEBUG_REROUTER if (DEBUGCOND) std::cout << " rerouting: newDest=" << newEdge->getID() - << " newEdges=" << toString(edges) - << " useNewRoute=" << useNewRoute << " newArrivalPos=" << newArrivalPos << " numClosed=" << rerouteDef->closed.size() - << " destUnreachable=" << destUnreachable << " containsClosed=" << veh.getRoute().containsAnyOf(rerouteDef->closed) << "\n"; - #endif + << " newEdges=" << toString(edges) + << " useNewRoute=" << useNewRoute << " newArrivalPos=" << newArrivalPos << " numClosed=" << rerouteDef->closed.size() + << " destUnreachable=" << destUnreachable << " containsClosed=" << veh.getRoute().containsAnyOf(rerouteDef->closed) << "\n"; +#endif if (useNewRoute && newArrivalPos != -1) { // must be called here because replaceRouteEdges may also set the arrivalPos veh.setArrivalPos(newArrivalPos); @@ -631,11 +631,11 @@ MSTriggeredRerouter::triggerRouting(SUMOTrafficObject& tObject, MSMoveReminder:: bool success = !items.empty(); if (success) { MSTransportableRouter& router = hasReroutingDevice - ? MSRoutingEngine::getIntermodalRouterTT(tObject.getRNGIndex(), rerouteDef->closed) - : MSNet::getInstance()->getIntermodalRouter(tObject.getRNGIndex(), 0, rerouteDef->closed); + ? MSRoutingEngine::getIntermodalRouterTT(tObject.getRNGIndex(), rerouteDef->closed) + : MSNet::getInstance()->getIntermodalRouter(tObject.getRNGIndex(), 0, rerouteDef->closed); success = router.compute(newEdge, lastEdge, newEdge->getLength() / 2., "", - tObject.getParameter().arrivalPos, "", - tObject.getMaxSpeed(), nullptr, 0, now, items); + tObject.getParameter().arrivalPos, "", + tObject.getMaxSpeed(), nullptr, 0, now, items); } if (success) { for (const MSTransportableRouter::TripItem& it : items) { @@ -1303,7 +1303,7 @@ MSTriggeredRerouter::applies(const SUMOTrafficObject& obj) const { bool MSTriggeredRerouter::affected(const std::set& edgeIndices, const MSEdgeVector& closed) { - for (const MSEdge* const e: closed) { + for (const MSEdge* const e : closed) { if (edgeIndices.count(e->getNumericalID()) > 0) { return true; } diff --git a/src/netbuild/NBEdgeCont.cpp b/src/netbuild/NBEdgeCont.cpp index bcffb409594f..d16b5203a34e 100644 --- a/src/netbuild/NBEdgeCont.cpp +++ b/src/netbuild/NBEdgeCont.cpp @@ -1476,7 +1476,7 @@ NBEdgeCont::extractRoundabouts() { visited.insert(e); loopEdges.push_back(e); const EdgeVector& outgoingEdges = e->getToNode()->getOutgoingEdges(); - EdgeVector::const_iterator me = std::find_if(outgoingEdges.begin(), outgoingEdges.end(), [](const NBEdge* outgoingEdge) { + EdgeVector::const_iterator me = std::find_if(outgoingEdges.begin(), outgoingEdges.end(), [](const NBEdge * outgoingEdge) { return outgoingEdge->getJunctionPriority(outgoingEdge->getToNode()) == NBEdge::JunctionPriority::ROUNDABOUT; }); if (me == outgoingEdges.end()) { // no closed loop diff --git a/src/netedit/GNEMoveElement.cpp b/src/netedit/GNEMoveElement.cpp index 3fa53371912a..4ae695e3de69 100644 --- a/src/netedit/GNEMoveElement.cpp +++ b/src/netedit/GNEMoveElement.cpp @@ -189,8 +189,8 @@ GNEMoveElement::GNEMoveElement() : GNEMoveOperation* -GNEMoveElement::calculateMoveShapeOperation(const GUIGlObject* obj, const PositionVector originalShape, - const bool maintainShapeClosed) { +GNEMoveElement::calculateMoveShapeOperation(const GUIGlObject* obj, const PositionVector originalShape, + const bool maintainShapeClosed) { // get moved geometry points const auto geometryPoints = gViewObjectsHandler.getGeometryPoints(obj); // get pos over shape diff --git a/src/netedit/GNENet.cpp b/src/netedit/GNENet.cpp index 2bbde8311cd9..0da35877f812 100644 --- a/src/netedit/GNENet.cpp +++ b/src/netedit/GNENet.cpp @@ -1165,7 +1165,7 @@ GNENet::createRoundabout(GNEJunction* junction, GNEUndoList* undoList) { bool GNENet::checkJunctionPosition(const Position& pos) { // Check that there isn't another junction in the same position as Pos - for (auto &junction : myAttributeCarriers->getJunctions()) { + for (auto& junction : myAttributeCarriers->getJunctions()) { if (junction.second.second->getPositionInView() == pos) { return false; } @@ -1447,7 +1447,7 @@ GNENet::joinSelectedJunctions(GNEUndoList* undoList) { oldPos = pos; // Check that there isn't another junction in the same position as Pos but doesn't belong to cluster - for (auto &junction : myAttributeCarriers->getJunctions()) { + for (auto& junction : myAttributeCarriers->getJunctions()) { if ((junction.second.second->getPositionInView() == pos) && (cluster.find(junction.second.second->getNBNode()) == cluster.end())) { // show warning in gui testing debug mode WRITE_DEBUG("Opening FXMessageBox 'Join non-selected junction'"); @@ -1507,12 +1507,12 @@ GNENet::joinSelectedJunctions(GNEUndoList* undoList) { it->setLogicValid(false, undoList); } // remap edges - for (auto &incomingEdge : allIncoming) { + for (auto& incomingEdge : allIncoming) { GNEChange_Attribute::changeAttribute(myAttributeCarriers->getEdges().at(incomingEdge->getID()).second, SUMO_ATTR_TO, joined->getID(), undoList); } EdgeSet edgesWithin; - for (auto &outgoingEdge : allOutgoing) { + for (auto& outgoingEdge : allOutgoing) { // delete edges within the cluster GNEEdge* edge = myAttributeCarriers->getEdges().at(outgoingEdge->getID()).second; if (edge->getToJunction() == joined) { @@ -1559,7 +1559,7 @@ bool GNENet::cleanInvalidCrossings(GNEUndoList* undoList) { // obtain current net's crossings std::vector myNetCrossings; - for (const auto &junction : myAttributeCarriers->getJunctions()) { + for (const auto& junction : myAttributeCarriers->getJunctions()) { myNetCrossings.reserve(myNetCrossings.size() + junction.second.second->getGNECrossings().size()); myNetCrossings.insert(myNetCrossings.end(), junction.second.second->getGNECrossings().begin(), junction.second.second->getGNECrossings().end()); } @@ -1612,7 +1612,7 @@ void GNENet::removeSolitaryJunctions(GNEUndoList* undoList) { undoList->begin(GUIIcon::MODEDELETE, TL("clear junctions")); std::vector toRemove; - for (auto &junction : myAttributeCarriers->getJunctions()) { + for (auto& junction : myAttributeCarriers->getJunctions()) { if (junction.second.second->getNBNode()->getEdges().size() == 0) { toRemove.push_back(junction.second.second); } diff --git a/src/netedit/GNENetHelper.cpp b/src/netedit/GNENetHelper.cpp index e784b739abc7..2627cec45857 100644 --- a/src/netedit/GNENetHelper.cpp +++ b/src/netedit/GNENetHelper.cpp @@ -416,7 +416,7 @@ GNENetHelper::AttributeCarriers::retrieveJunction(const std::string& id, bool ha GNEJunction* GNENetHelper::AttributeCarriers::retrieveJunction(const GUIGlObject* glObject, bool hardFail) const { - for (const auto &junctionPair : myJunctions) { + for (const auto& junctionPair : myJunctions) { if (junctionPair.second.first == glObject) { return junctionPair.second.second; } @@ -692,7 +692,7 @@ GNENetHelper::AttributeCarriers::retrieveEdge(const std::string& id, bool hardFa GNEEdge* GNENetHelper::AttributeCarriers::retrieveEdge(const GUIGlObject* glObject, bool hardFail) const { - for (const auto &edgePair : myEdges) { + for (const auto& edgePair : myEdges) { if (edgePair.second.first == glObject) { return edgePair.second.second; } @@ -1021,8 +1021,8 @@ GNENetHelper::AttributeCarriers::retrieveAdditionals(const std::vector GNEDemandElement* GNENetHelper::AttributeCarriers::retrieveDemandElement(const GUIGlObject* glObject, bool hardFail) const { // iterate over all demand elements - for (const auto &demandElementTag : myDemandElements){ - for (const auto &demandElementPair : demandElementTag.second) { + for (const auto& demandElementTag : myDemandElements) { + for (const auto& demandElementPair : demandElementTag.second) { if (demandElementPair.first == glObject) { return demandElementPair.second; } @@ -1886,7 +1886,7 @@ GNENetHelper::AttributeCarriers::generateDataSetID(const std::string& prefix) co GNEDataInterval* -GNENetHelper::AttributeCarriers::retrieveDataInterval(const GNEAttributeCarrier *AC, bool hardFail) const { +GNENetHelper::AttributeCarriers::retrieveDataInterval(const GNEAttributeCarrier* AC, bool hardFail) const { if (myDataIntervals.count(AC)) { return myDataIntervals.at(AC); } else if (hardFail) { @@ -1904,7 +1904,7 @@ GNENetHelper::AttributeCarriers::getDataIntervals() const { void -GNENetHelper::AttributeCarriers::insertDataInterval(const GNEAttributeCarrier *AC, GNEDataInterval* dataInterval) { +GNENetHelper::AttributeCarriers::insertDataInterval(const GNEAttributeCarrier* AC, GNEDataInterval* dataInterval) { if (myDataIntervals.count(AC) > 0) { throw ProcessError(dataInterval->getTagStr() + " with ID='" + dataInterval->getID() + "' already exist"); } else { @@ -1934,8 +1934,8 @@ GNENetHelper::AttributeCarriers::deleteDataInterval(GNEDataInterval* dataInterva GNEGenericData* GNENetHelper::AttributeCarriers::retrieveGenericData(const GUIGlObject* glObject, bool hardFail) const { // iterate over all genericDatas - for (const auto &genericDataTag : myGenericDatas){ - for (const auto &genericDataPair : genericDataTag.second) { + for (const auto& genericDataTag : myGenericDatas) { + for (const auto& genericDataPair : genericDataTag.second) { if (genericDataPair.first == glObject) { return genericDataPair.second; } diff --git a/src/netedit/GNENetHelper.h b/src/netedit/GNENetHelper.h index afaaa171fbe9..ead5c5a2ca46 100644 --- a/src/netedit/GNENetHelper.h +++ b/src/netedit/GNENetHelper.h @@ -535,7 +535,7 @@ struct GNENetHelper { * @param[in] id The attribute carrier related with the dataInterval element * @param[in] hardFail Whether attempts to retrieve a nonexisting data set should result in an exception */ - GNEDataInterval* retrieveDataInterval(const GNEAttributeCarrier *AC, bool hardFail = true) const; + GNEDataInterval* retrieveDataInterval(const GNEAttributeCarrier* AC, bool hardFail = true) const; /// @brief get all data intervals of network const std::map& getDataIntervals() const; @@ -729,7 +729,7 @@ struct GNENetHelper { /// @{ /// @brief insert data interval in container - void insertDataInterval(const GNEAttributeCarrier *AC, GNEDataInterval* dataInterval); + void insertDataInterval(const GNEAttributeCarrier* AC, GNEDataInterval* dataInterval); /// @brief delete data interval of container void deleteDataInterval(GNEDataInterval* dataInterval); diff --git a/src/netedit/GNEPathManager.h b/src/netedit/GNEPathManager.h index dd4ffb6f17c8..c326f6cee3c5 100644 --- a/src/netedit/GNEPathManager.h +++ b/src/netedit/GNEPathManager.h @@ -60,7 +60,7 @@ class GNEPathManager { ~Segment(); /// @brief getcontour associated with segment - GNEContour *getContour() const; + GNEContour* getContour() const; /// @brief check if segment is the first path's segment bool isFirstSegment() const; @@ -118,7 +118,7 @@ class GNEPathManager { bool myLabelSegment; /// @brief contour associated with segment - GNEContour *myContour; + GNEContour* myContour; private: /// @brief default constructor diff --git a/src/netedit/GNEViewNet.cpp b/src/netedit/GNEViewNet.cpp index 80e1cef93042..a2ae4c6bf6c8 100644 --- a/src/netedit/GNEViewNet.cpp +++ b/src/netedit/GNEViewNet.cpp @@ -471,7 +471,7 @@ GNEViewNet::getViewObjectsSelector() const { void -GNEViewNet::updateObjectsInBoundary(const Boundary &boundary) { +GNEViewNet::updateObjectsInBoundary(const Boundary& boundary) { // clear post drawing elements gViewObjectsHandler.clearSelectedElements(); // set selection boundary in gObjectsInPosition @@ -496,7 +496,7 @@ GNEViewNet::updateObjectsInBoundary(const Boundary &boundary) { void -GNEViewNet::updateObjectsInPosition(const Position &pos) { +GNEViewNet::updateObjectsInPosition(const Position& pos) { // clear post drawing elements gViewObjectsHandler.clearSelectedElements(); // set selection position in gObjectsInPosition @@ -1011,7 +1011,7 @@ GNEViewNet::restrictLane(GNELane* lane, SUMOVehicleClass vclass) { const std::string bodyA = TL(" lanes will be restricted for "); const std::string bodyB = TL(". Continue?"); FXuint answer = FXMessageBox::question(getApp(), MBOX_YES_NO, (headerA + toString(vclass) + headerB).c_str(), "%s", - (toString(mapOfEdgesAndLanes.size() - counter) + bodyA + toString(vclass) + bodyB).c_str()); + (toString(mapOfEdgesAndLanes.size() - counter) + bodyA + toString(vclass) + bodyB).c_str()); if (answer != 1) { //1:yes, 2:no, 4:esc // write warning if netedit is running in testing mode if (answer == 2) { @@ -1089,7 +1089,7 @@ GNEViewNet::addRestrictedLane(GNELane* lane, SUMOVehicleClass vclass, const bool const std::string bodyA = TL(" restrictions for "); const std::string bodyB = TL(" will be added. Continue?"); FXuint answer = FXMessageBox::question(getApp(), MBOX_YES_NO, (headerA + toString(vclass) + headerB).c_str(), "%s", - (toString(setOfEdges.size() - counter) + bodyA + toString(vclass) + bodyB).c_str()); + (toString(setOfEdges.size() - counter) + bodyA + toString(vclass) + bodyB).c_str()); if (answer != 1) { //1:yes, 2:no, 4:esc // write warning if netedit is running in testing mode if (answer == 2) { @@ -1181,7 +1181,7 @@ GNEViewNet::removeRestrictedLane(GNELane* lane, SUMOVehicleClass vclass) { const std::string bodyA = TL(" restrictions for "); const std::string bodyB = TL(" will be removed. Continue?"); FXuint answer = FXMessageBox::question(getApp(), MBOX_YES_NO, (headerA + toString(vclass) + headerB).c_str(), "%s", - (toString(setOfEdges.size() - counter) + bodyA + toString(vclass) + bodyB).c_str()); + (toString(setOfEdges.size() - counter) + bodyA + toString(vclass) + bodyB).c_str()); if (answer != 1) { //1:yes, 2:no, 4:esc // write warning if netedit is running in testing mode if (answer == 2) { @@ -1304,7 +1304,7 @@ GNEViewNet::getRelDataAttrs() const { bool GNEViewNet::checkSelectEdges() const { if ((myNetworkViewOptions.selectEdges() && !myMouseButtonKeyPressed.shiftKeyPressed()) || - (!myNetworkViewOptions.selectEdges() && myMouseButtonKeyPressed.shiftKeyPressed())) { + (!myNetworkViewOptions.selectEdges() && myMouseButtonKeyPressed.shiftKeyPressed())) { return true; } else { return false; @@ -1975,8 +1975,8 @@ GNEViewNet::checkOverLockedElement(const GUIGlObject* GLObject, const bool isSel if (glObjectFront == GLObject) { return true; } else if (glObjectFront->getType() == GLObject->getType()) { - for (const auto &glObjectUnderCursor : myViewObjectsSelector.getGLObjects()) { - if (glObjectUnderCursor == GLObject){ + for (const auto& glObjectUnderCursor : myViewObjectsSelector.getGLObjects()) { + if (glObjectUnderCursor == GLObject) { return true; } } @@ -2002,7 +2002,7 @@ GNEJunction* GNEViewNet::getJunctionAtPopupPosition() { // get first object that can be found in their container for (const auto& glObjectLayer : gViewObjectsHandler.getSelectedObjects()) { - for (const auto &glObject : glObjectLayer.second) { + for (const auto& glObject : glObjectLayer.second) { auto junction = myNet->getAttributeCarriers()->retrieveJunction(glObject.object, false); if (junction) { return junction; @@ -2017,7 +2017,7 @@ GNEConnection* GNEViewNet::getConnectionAtPopupPosition() { // get first object that can be found in their container for (const auto& glObjectLayer : gViewObjectsHandler.getSelectedObjects()) { - for (const auto &glObject : glObjectLayer.second) { + for (const auto& glObject : glObjectLayer.second) { auto connection = myNet->getAttributeCarriers()->retrieveConnection(glObject.object, false); if (connection) { return connection; @@ -2032,7 +2032,7 @@ GNECrossing* GNEViewNet::getCrossingAtPopupPosition() { // get first object that can be found in their container for (const auto& glObjectLayer : gViewObjectsHandler.getSelectedObjects()) { - for (const auto &glObject : glObjectLayer.second) { + for (const auto& glObject : glObjectLayer.second) { auto crossing = myNet->getAttributeCarriers()->retrieveCrossing(glObject.object, false); if (crossing) { return crossing; @@ -2047,7 +2047,7 @@ GNEWalkingArea* GNEViewNet::getWalkingAreaAtPopupPosition() { // get first object that can be found in their container for (const auto& glObjectLayer : gViewObjectsHandler.getSelectedObjects()) { - for (const auto &glObject : glObjectLayer.second) { + for (const auto& glObject : glObjectLayer.second) { auto walkingArea = myNet->getAttributeCarriers()->retrieveWalkingArea(glObject.object, false); if (walkingArea) { return walkingArea; @@ -2062,7 +2062,7 @@ GNEEdge* GNEViewNet::getEdgeAtPopupPosition() { // get first object that can be found in their container for (const auto& glObjectLayer : gViewObjectsHandler.getSelectedObjects()) { - for (const auto &glObject : glObjectLayer.second) { + for (const auto& glObject : glObjectLayer.second) { auto edge = myNet->getAttributeCarriers()->retrieveEdge(glObject.object, false); if (edge) { return edge; @@ -2077,7 +2077,7 @@ GNELane* GNEViewNet::getLaneAtPopupPosition() { // get first object that can be found in their container for (const auto& glObjectLayer : gViewObjectsHandler.getSelectedObjects()) { - for (const auto &glObject : glObjectLayer.second) { + for (const auto& glObject : glObjectLayer.second) { auto lane = myNet->getAttributeCarriers()->retrieveLane(glObject.object, false); if (lane) { return lane; @@ -2092,7 +2092,7 @@ GNEAdditional* GNEViewNet::getAdditionalAtPopupPosition() { // get first object that can be found in their container for (const auto& glObjectLayer : gViewObjectsHandler.getSelectedObjects()) { - for (const auto &glObject : glObjectLayer.second) { + for (const auto& glObject : glObjectLayer.second) { auto additionalElement = myNet->getAttributeCarriers()->retrieveAdditional(glObject.object, false); if (additionalElement) { return additionalElement; @@ -2107,7 +2107,7 @@ GNEDemandElement* GNEViewNet::getDemandElementAtPopupPosition() { // get first object that can be found in their container for (const auto& glObjectLayer : gViewObjectsHandler.getSelectedObjects()) { - for (const auto &glObject : glObjectLayer.second) { + for (const auto& glObject : glObjectLayer.second) { auto demandElement = myNet->getAttributeCarriers()->retrieveDemandElement(glObject.object, false); if (demandElement) { return demandElement; @@ -2122,7 +2122,7 @@ GNEPoly* GNEViewNet::getPolygonAtPopupPosition() { // get first object that can be parsed to poly element for (const auto& glObjectLayer : gViewObjectsHandler.getSelectedObjects()) { - for (const auto &glObject : glObjectLayer.second) { + for (const auto& glObject : glObjectLayer.second) { auto polygon = dynamic_cast(myNet->getAttributeCarriers()->retrieveAdditional(glObject.object, false)); if (polygon) { return polygon; @@ -2137,7 +2137,7 @@ GNEPOI* GNEViewNet::getPOIAtPopupPosition() { // get first object that can be parsed to POI element for (const auto& glObjectLayer : gViewObjectsHandler.getSelectedObjects()) { - for (const auto &glObject : glObjectLayer.second) { + for (const auto& glObject : glObjectLayer.second) { auto POI = dynamic_cast(myNet->getAttributeCarriers()->retrieveAdditional(glObject.object, false)); if (POI) { return POI; @@ -2152,7 +2152,7 @@ GNETAZ* GNEViewNet::getTAZAtPopupPosition() { // get first object that can be parsed to TAZ element for (const auto& glObjectLayer : gViewObjectsHandler.getSelectedObjects()) { - for (const auto &glObject : glObjectLayer.second) { + for (const auto& glObject : glObjectLayer.second) { auto TAZ = dynamic_cast(myNet->getAttributeCarriers()->retrieveAdditional(glObject.object, false)); if (TAZ) { return TAZ; diff --git a/src/netedit/GNEViewNet.h b/src/netedit/GNEViewNet.h index 7b41473b6b60..8dc0d680656e 100644 --- a/src/netedit/GNEViewNet.h +++ b/src/netedit/GNEViewNet.h @@ -87,10 +87,10 @@ class GNEViewNet : public GUISUMOAbstractView { const GNEViewNetHelper::MoveMultipleElementModul& getMoveMultipleElementValues() const; /// @brief get objects in the given boundary - void updateObjectsInBoundary(const Boundary &boundary); + void updateObjectsInBoundary(const Boundary& boundary); /// @brief get objects in the given position - void updateObjectsInPosition(const Position &pos); + void updateObjectsInPosition(const Position& pos); /** @brief Builds an entry which allows to (de)select the object * @param ret The popup menu to add the entry to diff --git a/src/netedit/GNEViewNetHelper.cpp b/src/netedit/GNEViewNetHelper.cpp index 78c737f23cba..1822e62a940b 100644 --- a/src/netedit/GNEViewNetHelper.cpp +++ b/src/netedit/GNEViewNetHelper.cpp @@ -232,7 +232,7 @@ void GNEViewNetHelper::ViewObjectsSelector::filterEdges() { // get all edges to filter std::vector edges; - for (const auto &edge : myViewObjects.edges) { + for (const auto& edge : myViewObjects.edges) { edges.push_back(edge); } myViewObjects.filterElements(edges); @@ -243,7 +243,7 @@ void GNEViewNetHelper::ViewObjectsSelector::filterLanes() { // get all lanes to filter std::vector lanes; - for (const auto &lane : myViewObjects.lanes) { + for (const auto& lane : myViewObjects.lanes) { lanes.push_back(lane); } myViewObjects.filterElements(lanes); @@ -254,13 +254,13 @@ void GNEViewNetHelper::ViewObjectsSelector::filterLockedElements(const std::vector ignoreFilter) { std::vector GUIGlObjects; // get all locked elements - for (const auto &GUIGlObject : myViewObjects.GUIGlObjects) { + for (const auto& GUIGlObject : myViewObjects.GUIGlObjects) { if (GUIGlObject->isGLObjectLocked()) { GUIGlObjects.push_back(GUIGlObject); } } // apply ignore filter - for (const auto &ignoredType : ignoreFilter) { + for (const auto& ignoredType : ignoreFilter) { auto it = GUIGlObjects.begin(); while (it != GUIGlObjects.end()) { if ((*it)->getType() == ignoredType) { @@ -535,8 +535,8 @@ GNEViewNetHelper::ViewObjectsSelector::ViewObjectsContainer::clearElements() { void -GNEViewNetHelper::ViewObjectsSelector::ViewObjectsContainer::filterElements(const std::vector &objects) { - for (const auto &object : objects) { +GNEViewNetHelper::ViewObjectsSelector::ViewObjectsContainer::filterElements(const std::vector& objects) { + for (const auto& object : objects) { // remove from GUIGlObjects auto itGlObjects = GUIGlObjects.begin(); while (itGlObjects != GUIGlObjects.end()) { @@ -987,7 +987,7 @@ void GNEViewNetHelper::ViewObjectsSelector::processGUIGlObjects(const GUIViewObjectsHandler::GLObjectsSortedContainer& objectsContainer) { // iterate over filtered edge objects for (const auto& glObjectLayer : objectsContainer) { - for (const auto &glObject : glObjectLayer.second) { + for (const auto& glObject : glObjectLayer.second) { // update all elements by categories updateNetworkElements(myViewObjects, glObject.object); updateAdditionalElements(myViewObjects, glObject.object); diff --git a/src/netedit/GNEViewNetHelper.h b/src/netedit/GNEViewNetHelper.h index 28d56888e3c2..fcd8dd9e7f41 100644 --- a/src/netedit/GNEViewNetHelper.h +++ b/src/netedit/GNEViewNetHelper.h @@ -324,7 +324,7 @@ struct GNEViewNetHelper { void clearElements(); /// @brief filter elements - void filterElements(const std::vector &objects); + void filterElements(const std::vector& objects); /// @brief vector with the GUIGlObjects std::vector GUIGlObjects; diff --git a/src/netedit/elements/GNEAttributeCarrier.cpp b/src/netedit/elements/GNEAttributeCarrier.cpp index 860b7467624d..3f40b4df7bbf 100644 --- a/src/netedit/elements/GNEAttributeCarrier.cpp +++ b/src/netedit/elements/GNEAttributeCarrier.cpp @@ -960,7 +960,7 @@ GNEAttributeCarrier::fillNetworkElements() { GNEAttributeProperties::STRING | GNEAttributeProperties::DISCRETE | GNEAttributeProperties::DEFAULTVALUE, TL("How to compute right of way rules at this node"), SUMOXMLDefinitions::RightOfWayValues.getString(RightOfWay::DEFAULT)); - attrProperty.setDiscreteValues(SUMOXMLDefinitions::RightOfWayValues.getStrings()); + attrProperty.setDiscreteValues(SUMOXMLDefinitions::RightOfWayValues.getStrings()); myTagProperties[currentTag].addAttribute(attrProperty); attrProperty = GNEAttributeProperties(SUMO_ATTR_FRINGE, @@ -978,7 +978,7 @@ GNEAttributeCarrier::fillNetworkElements() { attrProperty = GNEAttributeProperties(SUMO_ATTR_TLTYPE, GNEAttributeProperties::STRING | GNEAttributeProperties::DISCRETE | GNEAttributeProperties::DEFAULTVALUE, TL("An optional type for the traffic light algorithm")); - attrProperty.setDiscreteValues(TLTypes); + attrProperty.setDiscreteValues(TLTypes); myTagProperties[currentTag].addAttribute(attrProperty); attrProperty = GNEAttributeProperties(SUMO_ATTR_TLLAYOUT, @@ -1699,7 +1699,7 @@ GNEAttributeCarrier::fillAdditionalElements() { GNETagProperties::Conflicts::NO_CONFLICTS, GNETagProperties::Conflicts::POS_LANE, GUIIcon::ACCESS, currentTag, TL("Access"), - {SUMO_TAG_BUS_STOP, SUMO_TAG_TRAIN_STOP}, FXRGBA(240, 255, 205, 255)); + {SUMO_TAG_BUS_STOP, SUMO_TAG_TRAIN_STOP}, FXRGBA(240, 255, 205, 255)); // set values of attributes attrProperty = GNEAttributeProperties(SUMO_ATTR_LANE, GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::UPDATEGEOMETRY, @@ -1970,7 +1970,7 @@ GNEAttributeCarrier::fillAdditionalElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::PARKINGSPACE, currentTag, TL("ParkingSpace"), - {SUMO_TAG_PARKING_AREA}, FXRGBA(240, 255, 205, 255)); + {SUMO_TAG_PARKING_AREA}, FXRGBA(240, 255, 205, 255)); // set values of attributes attrProperty = GNEAttributeProperties(SUMO_ATTR_POSITION, GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::POSITION | GNEAttributeProperties::UPDATEGEOMETRY, // virtual attribute from the combination of the actually attributes SUMO_ATTR_X, SUMO_ATTR_Y @@ -2298,7 +2298,7 @@ GNEAttributeCarrier::fillAdditionalElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::E3ENTRY, currentTag, TL("E3 DetEntry"), - {SUMO_TAG_ENTRY_EXIT_DETECTOR}, FXRGBA(210, 233, 255, 255)); + {SUMO_TAG_ENTRY_EXIT_DETECTOR}, FXRGBA(210, 233, 255, 255)); // set values of attributes attrProperty = GNEAttributeProperties(SUMO_ATTR_LANE, GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE, @@ -2328,7 +2328,7 @@ GNEAttributeCarrier::fillAdditionalElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::E3EXIT, currentTag, TL("E3 DetExit"), - {SUMO_TAG_ENTRY_EXIT_DETECTOR}, FXRGBA(210, 233, 255, 255)); + {SUMO_TAG_ENTRY_EXIT_DETECTOR}, FXRGBA(210, 233, 255, 255)); // set values of attributes attrProperty = GNEAttributeProperties(SUMO_ATTR_LANE, GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::UPDATEGEOMETRY, @@ -2487,7 +2487,7 @@ GNEAttributeCarrier::fillAdditionalElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::LANE, currentTag, TL("VariableSpeedSign (lane)"), - {SUMO_TAG_VSS}, FXRGBA(210, 233, 255, 255)); + {SUMO_TAG_VSS}, FXRGBA(210, 233, 255, 255)); } currentTag = SUMO_TAG_STEP; { @@ -2498,7 +2498,7 @@ GNEAttributeCarrier::fillAdditionalElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::VSSSTEP, currentTag, TL("VariableSpeedSign Step"), - {SUMO_TAG_VSS}, FXRGBA(210, 233, 255, 255)); + {SUMO_TAG_VSS}, FXRGBA(210, 233, 255, 255)); // set values of attributes attrProperty = GNEAttributeProperties(SUMO_ATTR_TIME, GNEAttributeProperties::SUMOTIME | GNEAttributeProperties::UNIQUE, @@ -2638,7 +2638,7 @@ GNEAttributeCarrier::fillAdditionalElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::FLOW, SUMO_TAG_FLOW, TL("CalibratorFlow"), - {SUMO_TAG_CALIBRATOR}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_CALIBRATOR}, FXRGBA(253, 255, 206, 255)); // set values of attributes attrProperty = GNEAttributeProperties(SUMO_ATTR_ROUTE, GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::UPDATEGEOMETRY, @@ -2744,7 +2744,7 @@ GNEAttributeCarrier::fillAdditionalElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::EDGE, currentTag, TL("Rerouter (Edge)"), - {GNE_TAG_REROUTER_SYMBOL}, FXRGBA(255, 213, 213, 255)); + {GNE_TAG_REROUTER_SYMBOL}, FXRGBA(255, 213, 213, 255)); } currentTag = SUMO_TAG_INTERVAL; { @@ -2755,7 +2755,7 @@ GNEAttributeCarrier::fillAdditionalElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::REROUTERINTERVAL, currentTag, TL("Rerouter Interval"), - {SUMO_TAG_REROUTER}, FXRGBA(255, 213, 213, 255)); + {SUMO_TAG_REROUTER}, FXRGBA(255, 213, 213, 255)); // set values of attributes attrProperty = GNEAttributeProperties(SUMO_ATTR_BEGIN, GNEAttributeProperties::SUMOTIME | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::DEFAULTVALUE, @@ -2778,7 +2778,7 @@ GNEAttributeCarrier::fillAdditionalElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::CLOSINGREROUTE, currentTag, TL("ClosingReroute"), - {SUMO_TAG_INTERVAL}, FXRGBA(255, 213, 213, 255)); + {SUMO_TAG_INTERVAL}, FXRGBA(255, 213, 213, 255)); // set values of attributes attrProperty = GNEAttributeProperties(SUMO_ATTR_EDGE, GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::SYNONYM | GNEAttributeProperties::UPDATEGEOMETRY, @@ -2805,7 +2805,7 @@ GNEAttributeCarrier::fillAdditionalElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::CLOSINGLANEREROUTE, currentTag, TL("ClosingLaneReroute"), - {SUMO_TAG_INTERVAL}, FXRGBA(255, 213, 213, 255)); + {SUMO_TAG_INTERVAL}, FXRGBA(255, 213, 213, 255)); // set values of attributes attrProperty = GNEAttributeProperties(SUMO_ATTR_LANE, GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::SYNONYM | GNEAttributeProperties::UPDATEGEOMETRY, @@ -2832,7 +2832,7 @@ GNEAttributeCarrier::fillAdditionalElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::DESTPROBREROUTE, currentTag, TL("DestinyProbabilityReroute"), - {SUMO_TAG_INTERVAL}, FXRGBA(255, 213, 213, 255)); + {SUMO_TAG_INTERVAL}, FXRGBA(255, 213, 213, 255)); // set values of attributes attrProperty = GNEAttributeProperties(SUMO_ATTR_EDGE, GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::SYNONYM | GNEAttributeProperties::UPDATEGEOMETRY, @@ -2855,7 +2855,7 @@ GNEAttributeCarrier::fillAdditionalElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::PARKINGZONEREROUTE, currentTag, TL("ParkingAreaReroute"), - {SUMO_TAG_INTERVAL}, FXRGBA(255, 213, 213, 255)); + {SUMO_TAG_INTERVAL}, FXRGBA(255, 213, 213, 255)); // set values of attributes attrProperty = GNEAttributeProperties(SUMO_ATTR_PARKING, GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::SYNONYM, @@ -2884,7 +2884,7 @@ GNEAttributeCarrier::fillAdditionalElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::ROUTEPROBREROUTE, currentTag, TL("RouteProbabilityReroute"), - {SUMO_TAG_INTERVAL}, FXRGBA(255, 213, 213, 255)); + {SUMO_TAG_INTERVAL}, FXRGBA(255, 213, 213, 255)); // set values of attributes attrProperty = GNEAttributeProperties(SUMO_ATTR_ROUTE, GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::SYNONYM | GNEAttributeProperties::UPDATEGEOMETRY, @@ -3171,7 +3171,7 @@ GNEAttributeCarrier::fillTAZElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::TAZEDGE, currentTag, TL("TAZ Source"), - {SUMO_TAG_TAZ}); + {SUMO_TAG_TAZ}); // set values of attributes attrProperty = GNEAttributeProperties(SUMO_ATTR_EDGE, GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::SYNONYM | GNEAttributeProperties::UPDATEGEOMETRY, @@ -3194,7 +3194,7 @@ GNEAttributeCarrier::fillTAZElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::TAZEDGE, currentTag, TL("TAZ Sink"), - {SUMO_TAG_TAZ}); + {SUMO_TAG_TAZ}); // set values of attributes attrProperty = GNEAttributeProperties(SUMO_ATTR_EDGE, GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::SYNONYM | GNEAttributeProperties::UPDATEGEOMETRY, @@ -4155,7 +4155,7 @@ GNEAttributeCarrier::fillStopElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::STOPELEMENT, SUMO_TAG_STOP, TL("StopLane"), - {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(255, 213, 213, 255)); + {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(255, 213, 213, 255)); // set values of attributes attrProperty = GNEAttributeProperties(SUMO_ATTR_LANE, GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::UPDATEGEOMETRY, @@ -4197,7 +4197,7 @@ GNEAttributeCarrier::fillStopElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::STOPELEMENT, SUMO_TAG_STOP, TL("StopBusStop"), - {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(255, 213, 213, 255)); + {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(255, 213, 213, 255)); // set values of attributes attrProperty = GNEAttributeProperties(SUMO_ATTR_BUS_STOP, GNEAttributeProperties::STRING | GNEAttributeProperties::LIST | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::UPDATEGEOMETRY, @@ -4216,7 +4216,7 @@ GNEAttributeCarrier::fillStopElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::STOPELEMENT, SUMO_TAG_STOP, TL("StopTrainStop"), - {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(255, 213, 213, 255)); + {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(255, 213, 213, 255)); // set values of attributes attrProperty = GNEAttributeProperties(SUMO_ATTR_TRAIN_STOP, GNEAttributeProperties::STRING | GNEAttributeProperties::LIST | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::UPDATEGEOMETRY, @@ -4235,7 +4235,7 @@ GNEAttributeCarrier::fillStopElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::STOPELEMENT, SUMO_TAG_STOP, TL("StopContainerStop"), - {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(255, 213, 213, 255)); + {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(255, 213, 213, 255)); // set values of attributes attrProperty = GNEAttributeProperties(SUMO_ATTR_CONTAINER_STOP, GNEAttributeProperties::STRING | GNEAttributeProperties::LIST | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::UPDATEGEOMETRY, @@ -4254,7 +4254,7 @@ GNEAttributeCarrier::fillStopElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::STOPELEMENT, SUMO_TAG_STOP, TL("StopChargingStation"), - {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(255, 213, 213, 255)); + {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(255, 213, 213, 255)); // set values of attributes attrProperty = GNEAttributeProperties(SUMO_ATTR_CHARGING_STATION, GNEAttributeProperties::STRING | GNEAttributeProperties::LIST | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::UPDATEGEOMETRY, @@ -4273,7 +4273,7 @@ GNEAttributeCarrier::fillStopElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::STOPELEMENT, SUMO_TAG_STOP, TL("StopParkingArea"), - {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(255, 213, 213, 255)); + {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(255, 213, 213, 255)); // set values of attributes attrProperty = GNEAttributeProperties(SUMO_ATTR_PARKING_AREA, GNEAttributeProperties::STRING | GNEAttributeProperties::LIST | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::UPDATEGEOMETRY, @@ -4301,7 +4301,7 @@ GNEAttributeCarrier::fillWaypointElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WAYPOINT, SUMO_TAG_STOP, TL("WaypointLane"), - {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(240, 255, 205, 255)); + {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(240, 255, 205, 255)); // set values of attributes attrProperty = GNEAttributeProperties(SUMO_ATTR_LANE, GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::UPDATEGEOMETRY, @@ -4343,7 +4343,7 @@ GNEAttributeCarrier::fillWaypointElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WAYPOINT, SUMO_TAG_STOP, TL("WaypointBusStop"), - {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(240, 255, 205, 255)); + {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(240, 255, 205, 255)); // set values of attributes attrProperty = GNEAttributeProperties(SUMO_ATTR_BUS_STOP, GNEAttributeProperties::STRING | GNEAttributeProperties::LIST | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::UPDATEGEOMETRY, @@ -4362,7 +4362,7 @@ GNEAttributeCarrier::fillWaypointElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WAYPOINT, SUMO_TAG_STOP, TL("WaypointTrainStop"), - {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(240, 255, 205, 255)); + {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(240, 255, 205, 255)); // set values of attributes attrProperty = GNEAttributeProperties(SUMO_ATTR_TRAIN_STOP, GNEAttributeProperties::STRING | GNEAttributeProperties::LIST | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::UPDATEGEOMETRY, @@ -4381,7 +4381,7 @@ GNEAttributeCarrier::fillWaypointElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WAYPOINT, SUMO_TAG_STOP, TL("WaypointContainerStop"), - {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(240, 255, 205, 255)); + {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(240, 255, 205, 255)); // set values of attributes attrProperty = GNEAttributeProperties(SUMO_ATTR_CONTAINER_STOP, GNEAttributeProperties::STRING | GNEAttributeProperties::LIST | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::UPDATEGEOMETRY, @@ -4400,7 +4400,7 @@ GNEAttributeCarrier::fillWaypointElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WAYPOINT, SUMO_TAG_STOP, TL("WaypointChargingStation"), - {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(240, 255, 205, 255)); + {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(240, 255, 205, 255)); // set values of attributes attrProperty = GNEAttributeProperties(SUMO_ATTR_CHARGING_STATION, GNEAttributeProperties::STRING | GNEAttributeProperties::LIST | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::UPDATEGEOMETRY, @@ -4419,7 +4419,7 @@ GNEAttributeCarrier::fillWaypointElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WAYPOINT, SUMO_TAG_STOP, TL("WaypointParkingArea"), - {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(240, 255, 205, 255)); + {SUMO_TAG_ROUTE, SUMO_TAG_TRIP, SUMO_TAG_FLOW}, FXRGBA(240, 255, 205, 255)); // set values of attributes attrProperty = GNEAttributeProperties(SUMO_ATTR_PARKING_AREA, GNEAttributeProperties::STRING | GNEAttributeProperties::LIST | GNEAttributeProperties::UNIQUE | GNEAttributeProperties::UPDATEGEOMETRY, @@ -4537,7 +4537,7 @@ GNEAttributeCarrier::fillContainerTransportElements() { GNETagProperties::TagParents::PLAN_FROM_EDGE | GNETagProperties::TagParents::PLAN_TO_EDGE, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::TRANSPORT_EDGE, SUMO_TAG_TRANSPORT, TL("Transport: edge->edge"), - {SUMO_TAG_CONTAINER, SUMO_TAG_CONTAINERFLOW}, FXRGBA(240, 255, 205, 255)); + {SUMO_TAG_CONTAINER, SUMO_TAG_CONTAINERFLOW}, FXRGBA(240, 255, 205, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillTransportCommonAttributes(currentTag); @@ -4551,7 +4551,7 @@ GNEAttributeCarrier::fillContainerTransportElements() { GNETagProperties::TagParents::PLAN_FROM_EDGE | GNETagProperties::TagParents::PLAN_TO_CONTAINERSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::TRANSPORT_CONTAINERSTOP, SUMO_TAG_TRANSPORT, TL("Transport: edge->containerStop"), - {SUMO_TAG_CONTAINER, SUMO_TAG_CONTAINERFLOW}, FXRGBA(240, 255, 205, 255)); + {SUMO_TAG_CONTAINER, SUMO_TAG_CONTAINERFLOW}, FXRGBA(240, 255, 205, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillTransportCommonAttributes(currentTag); @@ -4565,7 +4565,7 @@ GNEAttributeCarrier::fillContainerTransportElements() { GNETagProperties::TagParents::PLAN_FROM_CONTAINERSTOP | GNETagProperties::TagParents::PLAN_TO_EDGE, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::TRANSPORT_EDGE, SUMO_TAG_TRANSPORT, TL("Transport: containerStop->edge"), - {SUMO_TAG_CONTAINER, SUMO_TAG_CONTAINERFLOW}, FXRGBA(240, 255, 205, 255)); + {SUMO_TAG_CONTAINER, SUMO_TAG_CONTAINERFLOW}, FXRGBA(240, 255, 205, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillTransportCommonAttributes(currentTag); @@ -4579,7 +4579,7 @@ GNEAttributeCarrier::fillContainerTransportElements() { GNETagProperties::TagParents::PLAN_FROM_CONTAINERSTOP | GNETagProperties::TagParents::PLAN_TO_CONTAINERSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::TRANSPORT_CONTAINERSTOP, SUMO_TAG_TRANSPORT, TL("Transport: containerStop->containerStop"), - {SUMO_TAG_CONTAINER, SUMO_TAG_CONTAINERFLOW}, FXRGBA(240, 255, 205, 255)); + {SUMO_TAG_CONTAINER, SUMO_TAG_CONTAINERFLOW}, FXRGBA(240, 255, 205, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillTransportCommonAttributes(currentTag); @@ -4602,7 +4602,7 @@ GNEAttributeCarrier::fillContainerTranshipElements() { GNETagProperties::TagParents::PLAN_FROM_EDGE | GNETagProperties::TagParents::PLAN_TO_EDGE, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::TRANSHIP_EDGE, SUMO_TAG_TRANSHIP, TL("Tranship: edge->edge"), - {SUMO_TAG_CONTAINER, SUMO_TAG_CONTAINERFLOW}, FXRGBA(210, 233, 255, 255)); + {SUMO_TAG_CONTAINER, SUMO_TAG_CONTAINERFLOW}, FXRGBA(210, 233, 255, 255)); // set values of attributes fillPlanParentAttributes(currentTag); @@ -4617,7 +4617,7 @@ GNEAttributeCarrier::fillContainerTranshipElements() { GNETagProperties::TagParents::PLAN_FROM_EDGE | GNETagProperties::TagParents::PLAN_TO_CONTAINERSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::TRANSHIP_CONTAINERSTOP, SUMO_TAG_TRANSHIP, TL("Tranship: edge->containerStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(210, 233, 255, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(210, 233, 255, 255)); // set values of attributes fillPlanParentAttributes(currentTag); @@ -4632,7 +4632,7 @@ GNEAttributeCarrier::fillContainerTranshipElements() { GNETagProperties::TagParents::PLAN_FROM_CONTAINERSTOP | GNETagProperties::TagParents::PLAN_TO_EDGE, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::TRANSHIP_EDGE, SUMO_TAG_TRANSHIP, TL("Tranship: containerStop->edge"), - {SUMO_TAG_CONTAINER, SUMO_TAG_CONTAINERFLOW}, FXRGBA(210, 233, 255, 255)); + {SUMO_TAG_CONTAINER, SUMO_TAG_CONTAINERFLOW}, FXRGBA(210, 233, 255, 255)); // set values of attributes fillPlanParentAttributes(currentTag); @@ -4647,7 +4647,7 @@ GNEAttributeCarrier::fillContainerTranshipElements() { GNETagProperties::TagParents::PLAN_FROM_CONTAINERSTOP | GNETagProperties::TagParents::PLAN_TO_CONTAINERSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::TRANSHIP_CONTAINERSTOP, SUMO_TAG_TRANSHIP, TL("Tranship: containerStop->containerStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(210, 233, 255, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(210, 233, 255, 255)); // set values of attributes fillPlanParentAttributes(currentTag); @@ -4662,7 +4662,7 @@ GNEAttributeCarrier::fillContainerTranshipElements() { GNETagProperties::TagParents::PLAN_CONSECUTIVE_EDGES, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::TRANSHIP_EDGES, SUMO_TAG_TRANSHIP, TL("Tranship: edges"), - {SUMO_TAG_CONTAINER, SUMO_TAG_CONTAINERFLOW}, FXRGBA(210, 233, 255, 255)); + {SUMO_TAG_CONTAINER, SUMO_TAG_CONTAINERFLOW}, FXRGBA(210, 233, 255, 255)); // set values of attributes fillPlanParentAttributes(currentTag); @@ -4686,7 +4686,7 @@ GNEAttributeCarrier::fillContainerStopElements() { GNETagProperties::TagParents::PLAN_EDGE, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::STOPELEMENT, SUMO_TAG_STOP, TL("Stop: edge"), - {SUMO_TAG_CONTAINER, SUMO_TAG_CONTAINERFLOW}, FXRGBA(255, 213, 213, 255)); + {SUMO_TAG_CONTAINER, SUMO_TAG_CONTAINERFLOW}, FXRGBA(255, 213, 213, 255)); // set values of attributes fillPlanParentAttributes(currentTag); @@ -4701,7 +4701,7 @@ GNEAttributeCarrier::fillContainerStopElements() { GNETagProperties::TagParents::PLAN_FROM_CONTAINERSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::STOPELEMENT, SUMO_TAG_STOP, TL("Stop: containerStop"), - {SUMO_TAG_CONTAINER, SUMO_TAG_CONTAINERFLOW}, FXRGBA(255, 213, 213, 255)); + {SUMO_TAG_CONTAINER, SUMO_TAG_CONTAINERFLOW}, FXRGBA(255, 213, 213, 255)); // set values of attributes fillPlanParentAttributes(currentTag); @@ -4725,7 +4725,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { GNETagProperties::TagParents::PLAN_FROM_EDGE | GNETagProperties::TagParents::PLAN_TO_EDGE, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::PERSONTRIP_EDGE, SUMO_TAG_PERSONTRIP, TL("PersonTrip: edge->edge"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillPersonTripCommonAttributes(currentTag); @@ -4739,7 +4739,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { GNETagProperties::TagParents::PLAN_FROM_EDGE | GNETagProperties::TagParents::PLAN_TO_TAZ, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::PERSONTRIP_TAZ, SUMO_TAG_PERSONTRIP, TL("PersonTrip: edge->taz"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillPersonTripCommonAttributes(currentTag); @@ -4753,7 +4753,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { GNETagProperties::TagParents::PLAN_FROM_EDGE | GNETagProperties::TagParents::PLAN_TO_JUNCTION, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::PERSONTRIP_JUNCTION, SUMO_TAG_PERSONTRIP, TL("PersonTrip: edge->junction"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillPersonTripCommonAttributes(currentTag); @@ -4767,7 +4767,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { GNETagProperties::TagParents::PLAN_FROM_EDGE | GNETagProperties::TagParents::PLAN_TO_BUSSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::PERSONTRIP_BUSSTOP, SUMO_TAG_PERSONTRIP, TL("PersonTrip: edge->busStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillPersonTripCommonAttributes(currentTag); @@ -4781,7 +4781,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { GNETagProperties::TagParents::PLAN_FROM_EDGE | GNETagProperties::TagParents::PLAN_TO_TRAINSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::PERSONTRIP_TRAINSTOP, SUMO_TAG_PERSONTRIP, TL("PersonTrip: edge->trainStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillPersonTripCommonAttributes(currentTag); @@ -4796,7 +4796,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { GNETagProperties::TagParents::PLAN_FROM_TAZ | GNETagProperties::TagParents::PLAN_TO_EDGE, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::PERSONTRIP_TAZ, SUMO_TAG_PERSONTRIP, TL("PersonTrip: taz->edge"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillPersonTripCommonAttributes(currentTag); @@ -4810,7 +4810,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { GNETagProperties::TagParents::PLAN_FROM_TAZ | GNETagProperties::TagParents::PLAN_TO_TAZ, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::PERSONTRIP_TAZ, SUMO_TAG_PERSONTRIP, TL("PersonTrip: taz->taz"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillPersonTripCommonAttributes(currentTag); @@ -4824,7 +4824,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { GNETagProperties::TagParents::PLAN_FROM_TAZ | GNETagProperties::TagParents::PLAN_TO_JUNCTION, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::PERSONTRIP_JUNCTION, SUMO_TAG_PERSONTRIP, TL("PersonTrip: taz->junction"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillPersonTripCommonAttributes(currentTag); @@ -4839,7 +4839,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { GNETagProperties::TagParents::PLAN_FROM_TAZ | GNETagProperties::TagParents::PLAN_TO_BUSSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::PERSONTRIP_BUSSTOP, SUMO_TAG_PERSONTRIP, TL("PersonTrip: taz->busStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillPersonTripCommonAttributes(currentTag); @@ -4853,7 +4853,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { GNETagProperties::TagParents::PLAN_FROM_TAZ | GNETagProperties::TagParents::PLAN_TO_TRAINSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::PERSONTRIP_TRAINSTOP, SUMO_TAG_PERSONTRIP, TL("PersonTrip: taz->trainStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillPersonTripCommonAttributes(currentTag); @@ -4868,7 +4868,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { GNETagProperties::TagParents::PLAN_FROM_JUNCTION | GNETagProperties::TagParents::PLAN_TO_EDGE, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::PERSONTRIP_JUNCTION, SUMO_TAG_PERSONTRIP, TL("PersonTrip: junction->edge"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillPersonTripCommonAttributes(currentTag); @@ -4882,7 +4882,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { GNETagProperties::TagParents::PLAN_FROM_JUNCTION | GNETagProperties::TagParents::PLAN_TO_TAZ, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::PERSONTRIP_TAZ, SUMO_TAG_PERSONTRIP, TL("PersonTrip: junction->taz"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillPersonTripCommonAttributes(currentTag); @@ -4896,7 +4896,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { GNETagProperties::TagParents::PLAN_FROM_JUNCTION | GNETagProperties::TagParents::PLAN_TO_JUNCTION, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::PERSONTRIP_JUNCTION, SUMO_TAG_PERSONTRIP, TL("PersonTrip: junction->junction"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillPersonTripCommonAttributes(currentTag); @@ -4910,7 +4910,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { GNETagProperties::TagParents::PLAN_FROM_JUNCTION | GNETagProperties::TagParents::PLAN_TO_BUSSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::PERSONTRIP_BUSSTOP, SUMO_TAG_PERSONTRIP, TL("PersonTrip: junction->busStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillPersonTripCommonAttributes(currentTag); @@ -4924,7 +4924,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { GNETagProperties::TagParents::PLAN_FROM_JUNCTION | GNETagProperties::TagParents::PLAN_TO_TRAINSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::PERSONTRIP_TRAINSTOP, SUMO_TAG_PERSONTRIP, TL("PersonTrip: junction->trainStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillPersonTripCommonAttributes(currentTag); @@ -4939,7 +4939,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { GNETagProperties::TagParents::PLAN_FROM_BUSSTOP | GNETagProperties::TagParents::PLAN_TO_EDGE, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::PERSONTRIP_EDGE, SUMO_TAG_PERSONTRIP, TL("PersonTrip: busStop->edge"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillPersonTripCommonAttributes(currentTag); @@ -4953,7 +4953,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { GNETagProperties::TagParents::PLAN_FROM_BUSSTOP | GNETagProperties::TagParents::PLAN_TO_TAZ, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::PERSONTRIP_TAZ, SUMO_TAG_PERSONTRIP, TL("PersonTrip: busStop->taz"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillPersonTripCommonAttributes(currentTag); @@ -4967,7 +4967,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { GNETagProperties::TagParents::PLAN_FROM_BUSSTOP | GNETagProperties::TagParents::PLAN_TO_JUNCTION, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::PERSONTRIP_JUNCTION, SUMO_TAG_PERSONTRIP, TL("PersonTrip: busStop->taz"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillPersonTripCommonAttributes(currentTag); @@ -4981,7 +4981,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { GNETagProperties::TagParents::PLAN_FROM_BUSSTOP | GNETagProperties::TagParents::PLAN_TO_BUSSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::PERSONTRIP_BUSSTOP, SUMO_TAG_PERSONTRIP, TL("PersonTrip: busStop->busStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillPersonTripCommonAttributes(currentTag); @@ -4995,7 +4995,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { GNETagProperties::TagParents::PLAN_FROM_BUSSTOP | GNETagProperties::TagParents::PLAN_TO_TRAINSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::PERSONTRIP_TRAINSTOP, SUMO_TAG_PERSONTRIP, TL("PersonTrip: busStop->trainStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillPersonTripCommonAttributes(currentTag); @@ -5010,7 +5010,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { GNETagProperties::TagParents::PLAN_FROM_TRAINSTOP | GNETagProperties::TagParents::PLAN_TO_EDGE, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::PERSONTRIP_EDGE, SUMO_TAG_PERSONTRIP, TL("PersonTrip: trainStop->edge"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillPersonTripCommonAttributes(currentTag); @@ -5024,7 +5024,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { GNETagProperties::TagParents::PLAN_FROM_TRAINSTOP | GNETagProperties::TagParents::PLAN_TO_TAZ, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::PERSONTRIP_TAZ, SUMO_TAG_PERSONTRIP, TL("PersonTrip: trainStop->taz"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillPersonTripCommonAttributes(currentTag); @@ -5038,7 +5038,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { GNETagProperties::TagParents::PLAN_FROM_TRAINSTOP | GNETagProperties::TagParents::PLAN_TO_JUNCTION, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::PERSONTRIP_JUNCTION, SUMO_TAG_PERSONTRIP, TL("PersonTrip: trainStop->taz"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillPersonTripCommonAttributes(currentTag); @@ -5052,7 +5052,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { GNETagProperties::TagParents::PLAN_FROM_TRAINSTOP | GNETagProperties::TagParents::PLAN_TO_BUSSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::PERSONTRIP_BUSSTOP, SUMO_TAG_PERSONTRIP, TL("PersonTrip: trainStop->busStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillPersonTripCommonAttributes(currentTag); @@ -5066,7 +5066,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { GNETagProperties::TagParents::PLAN_FROM_TRAINSTOP | GNETagProperties::TagParents::PLAN_TO_TRAINSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::PERSONTRIP_TRAINSTOP, SUMO_TAG_PERSONTRIP, TL("PersonTrip: trainStop->trainStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillPersonTripCommonAttributes(currentTag); @@ -5088,7 +5088,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { GNETagProperties::TagParents::PLAN_CONSECUTIVE_EDGES, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WALK_EDGES, SUMO_TAG_WALK, TL("walk: edges"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(240, 255, 205, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(240, 255, 205, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillWalkCommonAttributes(currentTag); @@ -5102,7 +5102,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { GNETagProperties::TagParents::PLAN_ROUTE, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WALK_ROUTE, SUMO_TAG_WALK, TL("walk: route"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(240, 255, 205, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(240, 255, 205, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillWalkCommonAttributes(currentTag); @@ -5117,7 +5117,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { GNETagProperties::TagParents::PLAN_FROM_EDGE | GNETagProperties::TagParents::PLAN_TO_EDGE, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WALK_EDGE, SUMO_TAG_WALK, TL("Walk: edge->edge"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillWalkCommonAttributes(currentTag); @@ -5131,7 +5131,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { GNETagProperties::TagParents::PLAN_FROM_EDGE | GNETagProperties::TagParents::PLAN_TO_TAZ, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WALK_TAZ, SUMO_TAG_WALK, TL("Walk: edge->taz"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillWalkCommonAttributes(currentTag); @@ -5145,7 +5145,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { GNETagProperties::TagParents::PLAN_FROM_EDGE | GNETagProperties::TagParents::PLAN_TO_JUNCTION, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WALK_JUNCTION, SUMO_TAG_WALK, TL("Walk: edge->junction"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillWalkCommonAttributes(currentTag); @@ -5159,7 +5159,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { GNETagProperties::TagParents::PLAN_FROM_EDGE | GNETagProperties::TagParents::PLAN_TO_BUSSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WALK_BUSSTOP, SUMO_TAG_WALK, TL("Walk: edge->busStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillWalkCommonAttributes(currentTag); @@ -5173,7 +5173,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { GNETagProperties::TagParents::PLAN_FROM_EDGE | GNETagProperties::TagParents::PLAN_TO_TRAINSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WALK_TRAINSTOP, SUMO_TAG_WALK, TL("Walk: edge->trainStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillWalkCommonAttributes(currentTag); @@ -5188,7 +5188,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { GNETagProperties::TagParents::PLAN_FROM_TAZ | GNETagProperties::TagParents::PLAN_TO_EDGE, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WALK_TAZ, SUMO_TAG_WALK, TL("Walk: taz->edge"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillWalkCommonAttributes(currentTag); @@ -5202,7 +5202,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { GNETagProperties::TagParents::PLAN_FROM_TAZ | GNETagProperties::TagParents::PLAN_TO_TAZ, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WALK_TAZ, SUMO_TAG_WALK, TL("Walk: taz->taz"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillWalkCommonAttributes(currentTag); @@ -5216,7 +5216,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { GNETagProperties::TagParents::PLAN_FROM_TAZ | GNETagProperties::TagParents::PLAN_TO_JUNCTION, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WALK_JUNCTION, SUMO_TAG_WALK, TL("Walk: taz->junction"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillWalkCommonAttributes(currentTag); @@ -5231,7 +5231,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { GNETagProperties::TagParents::PLAN_FROM_TAZ | GNETagProperties::TagParents::PLAN_TO_BUSSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WALK_BUSSTOP, SUMO_TAG_WALK, TL("Walk: taz->busStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillWalkCommonAttributes(currentTag); @@ -5245,7 +5245,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { GNETagProperties::TagParents::PLAN_FROM_TAZ | GNETagProperties::TagParents::PLAN_TO_TRAINSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WALK_TRAINSTOP, SUMO_TAG_WALK, TL("Walk: taz->trainStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillWalkCommonAttributes(currentTag); @@ -5260,7 +5260,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { GNETagProperties::TagParents::PLAN_FROM_JUNCTION | GNETagProperties::TagParents::PLAN_TO_EDGE, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WALK_JUNCTION, SUMO_TAG_WALK, TL("Walk: junction->edge"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillWalkCommonAttributes(currentTag); @@ -5274,7 +5274,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { GNETagProperties::TagParents::PLAN_FROM_JUNCTION | GNETagProperties::TagParents::PLAN_TO_TAZ, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WALK_TAZ, SUMO_TAG_WALK, TL("Walk: junction->taz"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillWalkCommonAttributes(currentTag); @@ -5288,7 +5288,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { GNETagProperties::TagParents::PLAN_FROM_JUNCTION | GNETagProperties::TagParents::PLAN_TO_JUNCTION, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WALK_JUNCTION, SUMO_TAG_WALK, TL("Walk: junction->junction"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillWalkCommonAttributes(currentTag); @@ -5302,7 +5302,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { GNETagProperties::TagParents::PLAN_FROM_JUNCTION | GNETagProperties::TagParents::PLAN_TO_BUSSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WALK_BUSSTOP, SUMO_TAG_WALK, TL("Walk: junction->busStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillWalkCommonAttributes(currentTag); @@ -5316,7 +5316,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { GNETagProperties::TagParents::PLAN_FROM_JUNCTION | GNETagProperties::TagParents::PLAN_TO_TRAINSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WALK_TRAINSTOP, SUMO_TAG_WALK, TL("Walk: junction->trainStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillWalkCommonAttributes(currentTag); @@ -5331,7 +5331,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { GNETagProperties::TagParents::PLAN_FROM_BUSSTOP | GNETagProperties::TagParents::PLAN_TO_EDGE, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WALK_EDGE, SUMO_TAG_WALK, TL("Walk: busStop->edge"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillWalkCommonAttributes(currentTag); @@ -5345,7 +5345,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { GNETagProperties::TagParents::PLAN_FROM_BUSSTOP | GNETagProperties::TagParents::PLAN_TO_TAZ, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WALK_TAZ, SUMO_TAG_WALK, TL("Walk: busStop->taz"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillWalkCommonAttributes(currentTag); @@ -5359,7 +5359,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { GNETagProperties::TagParents::PLAN_FROM_BUSSTOP | GNETagProperties::TagParents::PLAN_TO_JUNCTION, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WALK_JUNCTION, SUMO_TAG_WALK, TL("Walk: busStop->taz"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillWalkCommonAttributes(currentTag); @@ -5373,7 +5373,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { GNETagProperties::TagParents::PLAN_FROM_BUSSTOP | GNETagProperties::TagParents::PLAN_TO_BUSSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WALK_BUSSTOP, SUMO_TAG_WALK, TL("Walk: busStop->busStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillWalkCommonAttributes(currentTag); @@ -5387,7 +5387,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { GNETagProperties::TagParents::PLAN_FROM_BUSSTOP | GNETagProperties::TagParents::PLAN_TO_TRAINSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WALK_TRAINSTOP, SUMO_TAG_WALK, TL("Walk: busStop->trainStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillWalkCommonAttributes(currentTag); @@ -5402,7 +5402,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { GNETagProperties::TagParents::PLAN_FROM_TRAINSTOP | GNETagProperties::TagParents::PLAN_TO_EDGE, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WALK_EDGE, SUMO_TAG_WALK, TL("Walk: trainStop->edge"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillWalkCommonAttributes(currentTag); @@ -5416,7 +5416,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { GNETagProperties::TagParents::PLAN_FROM_TRAINSTOP | GNETagProperties::TagParents::PLAN_TO_TAZ, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WALK_TAZ, SUMO_TAG_WALK, TL("Walk: trainStop->taz"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillWalkCommonAttributes(currentTag); @@ -5430,7 +5430,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { GNETagProperties::TagParents::PLAN_FROM_TRAINSTOP | GNETagProperties::TagParents::PLAN_TO_JUNCTION, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WALK_JUNCTION, SUMO_TAG_WALK, TL("Walk: trainStop->taz"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillWalkCommonAttributes(currentTag); @@ -5444,7 +5444,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { GNETagProperties::TagParents::PLAN_FROM_TRAINSTOP | GNETagProperties::TagParents::PLAN_TO_BUSSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WALK_BUSSTOP, SUMO_TAG_WALK, TL("Walk: trainStop->busStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillWalkCommonAttributes(currentTag); @@ -5458,7 +5458,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { GNETagProperties::TagParents::PLAN_FROM_TRAINSTOP | GNETagProperties::TagParents::PLAN_TO_TRAINSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::WALK_TRAINSTOP, SUMO_TAG_WALK, TL("Walk: trainStop->trainStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillWalkCommonAttributes(currentTag); @@ -5480,7 +5480,7 @@ GNEAttributeCarrier::fillPersonPlanRides() { GNETagProperties::TagParents::PLAN_FROM_EDGE | GNETagProperties::TagParents::PLAN_TO_EDGE, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::RIDE_EDGE, SUMO_TAG_RIDE, TL("Ride: edge->edge"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillRideCommonAttributes(currentTag); @@ -5494,7 +5494,7 @@ GNEAttributeCarrier::fillPersonPlanRides() { GNETagProperties::TagParents::PLAN_FROM_EDGE | GNETagProperties::TagParents::PLAN_TO_BUSSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::RIDE_BUSSTOP, SUMO_TAG_RIDE, TL("Ride: edge->busStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillRideCommonAttributes(currentTag); @@ -5508,7 +5508,7 @@ GNEAttributeCarrier::fillPersonPlanRides() { GNETagProperties::TagParents::PLAN_FROM_EDGE | GNETagProperties::TagParents::PLAN_TO_TRAINSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::RIDE_TRAINSTOP, SUMO_TAG_RIDE, TL("Ride: edge->trainStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillRideCommonAttributes(currentTag); @@ -5523,7 +5523,7 @@ GNEAttributeCarrier::fillPersonPlanRides() { GNETagProperties::TagParents::PLAN_FROM_BUSSTOP | GNETagProperties::TagParents::PLAN_TO_EDGE, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::RIDE_EDGE, SUMO_TAG_RIDE, TL("Ride: busStop->edge"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillRideCommonAttributes(currentTag); @@ -5537,7 +5537,7 @@ GNEAttributeCarrier::fillPersonPlanRides() { GNETagProperties::TagParents::PLAN_FROM_BUSSTOP | GNETagProperties::TagParents::PLAN_TO_BUSSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::RIDE_BUSSTOP, SUMO_TAG_RIDE, TL("Ride: busStop->busStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillRideCommonAttributes(currentTag); @@ -5551,7 +5551,7 @@ GNEAttributeCarrier::fillPersonPlanRides() { GNETagProperties::TagParents::PLAN_FROM_BUSSTOP | GNETagProperties::TagParents::PLAN_TO_TRAINSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::RIDE_TRAINSTOP, SUMO_TAG_RIDE, TL("Ride: busStop->trainStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillRideCommonAttributes(currentTag); @@ -5566,7 +5566,7 @@ GNEAttributeCarrier::fillPersonPlanRides() { GNETagProperties::TagParents::PLAN_FROM_TRAINSTOP | GNETagProperties::TagParents::PLAN_TO_EDGE, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::RIDE_EDGE, SUMO_TAG_RIDE, TL("Ride: trainStop->edge"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillRideCommonAttributes(currentTag); @@ -5580,7 +5580,7 @@ GNEAttributeCarrier::fillPersonPlanRides() { GNETagProperties::TagParents::PLAN_FROM_TRAINSTOP | GNETagProperties::TagParents::PLAN_TO_BUSSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::RIDE_BUSSTOP, SUMO_TAG_RIDE, TL("Ride: train->busStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillRideCommonAttributes(currentTag); @@ -5594,7 +5594,7 @@ GNEAttributeCarrier::fillPersonPlanRides() { GNETagProperties::TagParents::PLAN_FROM_TRAINSTOP | GNETagProperties::TagParents::PLAN_TO_TRAINSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::RIDE_TRAINSTOP, SUMO_TAG_RIDE, TL("Ride: train->trainStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes fillPlanParentAttributes(currentTag); fillRideCommonAttributes(currentTag); @@ -5616,7 +5616,7 @@ GNEAttributeCarrier::fillPersonStopElements() { GNETagProperties::TagParents::PLAN_EDGE, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::STOPELEMENT, SUMO_TAG_STOP, TL("Stop: edge"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(255, 213, 213, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(255, 213, 213, 255)); // set values of attributes fillPlanParentAttributes(currentTag); @@ -5631,7 +5631,7 @@ GNEAttributeCarrier::fillPersonStopElements() { GNETagProperties::TagParents::PLAN_BUSSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::STOPELEMENT, SUMO_TAG_STOP, TL("Stop: busStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(255, 213, 213, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(255, 213, 213, 255)); // set values of attributes fillPlanParentAttributes(currentTag); @@ -5646,7 +5646,7 @@ GNEAttributeCarrier::fillPersonStopElements() { GNETagProperties::TagParents::PLAN_TRAINSTOP, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::STOPELEMENT, SUMO_TAG_STOP, TL("Stop: trainStop"), - {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(255, 213, 213, 255)); + {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(255, 213, 213, 255)); // set values of attributes fillPlanParentAttributes(currentTag); @@ -6781,7 +6781,7 @@ GNEAttributeCarrier::fillDataElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::DATAINTERVAL, currentTag, TL("DataInterval"), - {SUMO_TAG_DATASET}); + {SUMO_TAG_DATASET}); // set values of attributes attrProperty = GNEAttributeProperties(SUMO_ATTR_ID, @@ -6849,7 +6849,7 @@ GNEAttributeCarrier::fillDataElements() { GNETagProperties::TagParents::NO_PARENTS, GNETagProperties::Conflicts::NO_CONFLICTS, GUIIcon::TAZRELDATA, currentTag, TL("TAZRelation"), - {SUMO_TAG_DATAINTERVAL}); + {SUMO_TAG_DATAINTERVAL}); // set values of attributes attrProperty = GNEAttributeProperties(SUMO_ATTR_FROM, diff --git a/src/netedit/elements/GNEContour.cpp b/src/netedit/elements/GNEContour.cpp index f975c24dc562..dc7aba0fff44 100644 --- a/src/netedit/elements/GNEContour.cpp +++ b/src/netedit/elements/GNEContour.cpp @@ -84,9 +84,9 @@ GNEContour::calculateContourClosedShape(const GUIVisualizationSettings& s, const void GNEContour::calculateContourExtrudedShape(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const GUIGlObject* glObject, const PositionVector& shape, const double extrusionWidth, - const double scale, const bool closeFirstExtrem, const bool closeLastExtrem, - const double offset) const { + const GUIGlObject* glObject, const PositionVector& shape, const double extrusionWidth, + const double scale, const bool closeFirstExtrem, const bool closeLastExtrem, + const double offset) const { // check if we're in drawForObjectUnderCursor if (s.drawForViewObjectsHandler) { // calculate extruded shape @@ -99,8 +99,8 @@ GNEContour::calculateContourExtrudedShape(const GUIVisualizationSettings& s, con void GNEContour::calculateContourRectangleShape(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const GUIGlObject* glObject, const Position& pos, const double width, const double height, - const double offsetX, const double offsetY, const double rot, const double scale) const { + const GUIGlObject* glObject, const Position& pos, const double width, const double height, + const double offsetX, const double offsetY, const double rot, const double scale) const { // check if we're in drawForObjectUnderCursor if (s.drawForViewObjectsHandler) { // calculate rectangle shape @@ -146,8 +146,8 @@ GNEContour::calculateContourEdges(const GUIVisualizationSettings& s, const GUIVi void GNEContour::calculateContourFirstGeometryPoint(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const GUIGlObject* glObject, const PositionVector& shape, double radius, - const double scale) const { + const GUIGlObject* glObject, const PositionVector& shape, double radius, + const double scale) const { // check if we're in drawForObjectUnderCursor if (s.drawForViewObjectsHandler && (shape.size() > 0)) { // check position within geometry of first geometry point @@ -158,8 +158,8 @@ GNEContour::calculateContourFirstGeometryPoint(const GUIVisualizationSettings& s void GNEContour::calculateContourLastGeometryPoint(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const GUIGlObject* glObject, const PositionVector& shape, double radius, - const double scale) const { + const GUIGlObject* glObject, const PositionVector& shape, double radius, + const double scale) const { // check if we're in drawForObjectUnderCursor if (s.drawForViewObjectsHandler && (shape.size() > 0)) { // check position within geometry of last geometry point @@ -170,8 +170,8 @@ GNEContour::calculateContourLastGeometryPoint(const GUIVisualizationSettings& s, void GNEContour::calculateContourMiddleGeometryPoints(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const GUIGlObject* glObject, const PositionVector& shape, double radius, - const double scale) const { + const GUIGlObject* glObject, const PositionVector& shape, double radius, + const double scale) const { // check if we're in drawForObjectUnderCursor if (s.drawForViewObjectsHandler) { // check position within geometry of middle geometry points @@ -186,8 +186,8 @@ GNEContour::calculateContourMiddleGeometryPoints(const GUIVisualizationSettings& void GNEContour::calculateContourAllGeometryPoints(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const GUIGlObject* glObject, const PositionVector& shape, double radius, - const double scale, const bool calculatePosOverShape) const { + const GUIGlObject* glObject, const PositionVector& shape, double radius, + const double scale, const bool calculatePosOverShape) const { // check if we're in drawForObjectUnderCursor if (s.drawForViewObjectsHandler) { // check position within geometry of middle geometry points @@ -204,12 +204,12 @@ GNEContour::calculateContourAllGeometryPoints(const GUIVisualizationSettings& s, void GNEContour::calculateContourEdgeGeometryPoints(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const GNEEdge* edge, const double radius, const bool calculatePosOverShape, - const bool firstExtrem, const bool lastExtrem) const { + const GNEEdge* edge, const double radius, const bool calculatePosOverShape, + const bool firstExtrem, const bool lastExtrem) const { // first check if we're in drawForObjectUnderCursor if (s.drawForViewObjectsHandler && (gViewObjectsHandler.getSelectionPosition() != Position::INVALID)) { // get edge geometry - const auto &edgeGeometry = edge->getNBEdge()->getGeometry(); + const auto& edgeGeometry = edge->getNBEdge()->getGeometry(); // calculate last geometry point index const int lastGeometryPointIndex = (int)edgeGeometry.size() - 1; // we have two cases: if cursor is within geometry, or cursor is outher geometry @@ -259,7 +259,7 @@ GNEContour::calculateContourEdgeGeometryPoints(const GUIVisualizationSettings& s void GNEContour::drawDottedContours(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const GNEAttributeCarrier *AC, const double lineWidth, const bool addOffset) const { + const GNEAttributeCarrier* AC, const double lineWidth, const bool addOffset) const { // first check if draw dotted contour if (!s.disableDottedContours && (d <= GUIVisualizationSettings::Detail::DottedContours)) { // basic contours @@ -301,20 +301,20 @@ GNEContour::drawDottedContours(const GUIVisualizationSettings& s, const GUIVisua void GNEContour::drawDottedContourGeometryPoints(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const GNEAttributeCarrier *AC, const PositionVector &shape, const double radius, - const double scale, const double lineWidth) const { + const GNEAttributeCarrier* AC, const PositionVector& shape, const double radius, + const double scale, const double lineWidth) const { // first check if draw dotted contour - if (!s.disableDottedContours && (d <= GUIVisualizationSettings::Detail::DottedContours) && AC->checkDrawMoveContour() ) { + if (!s.disableDottedContours && (d <= GUIVisualizationSettings::Detail::DottedContours) && AC->checkDrawMoveContour()) { // get gl object const auto glObject = AC->getGUIGlObject(); // get geometry points - const auto &geometryPoints = gViewObjectsHandler.getGeometryPoints(glObject); + const auto& geometryPoints = gViewObjectsHandler.getGeometryPoints(glObject); // get temporal position over shape - const auto &posOverShape = gViewObjectsHandler.getPositionOverShape(glObject); + const auto& posOverShape = gViewObjectsHandler.getPositionOverShape(glObject); // either draw geometry points or position over shape if (geometryPoints.size() > 0) { // draw every geometry point - for (const auto &geometryPoint : geometryPoints) { + for (const auto& geometryPoint : geometryPoints) { // create circle shape const auto circleShape = GUIGeometry::getVertexCircleAroundPosition(shape[geometryPoint], radius * scale, 16); // calculate dotted geometry @@ -397,7 +397,7 @@ GNEContour::buildContourClosedShape(const GUIVisualizationSettings& s, const GUI void -GNEContour::buildContourExtrudedShape(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, +GNEContour::buildContourExtrudedShape(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, const PositionVector& shape, const double extrusionWidth, const double scale, const bool closeFirstExtrem, const bool closeLastExtrem, const double offset) const { // reset calculated shape @@ -423,10 +423,10 @@ GNEContour::buildContourExtrudedShape(const GUIVisualizationSettings& s, const G myDottedGeometries->at(2).getFrontPosition() }, false); } - for (const auto &position : myDottedGeometries->at(0).getUnresampledShape()) { + for (const auto& position : myDottedGeometries->at(0).getUnresampledShape()) { myCalculatedShape->push_back(position); } - for (const auto &position : myDottedGeometries->at(2).getUnresampledShape()) { + for (const auto& position : myDottedGeometries->at(2).getUnresampledShape()) { myCalculatedShape->push_back(position); } // update contour boundary @@ -438,7 +438,7 @@ GNEContour::buildContourExtrudedShape(const GUIVisualizationSettings& s, const G void -GNEContour::buildContourRectangle(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, +GNEContour::buildContourRectangle(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, const Position& pos, const double width, const double height, const double offsetX, const double offsetY, const double rot, const double scale) const { // reset calculated shape @@ -469,7 +469,7 @@ GNEContour::buildContourRectangle(const GUIVisualizationSettings& s, const GUIVi void -GNEContour::buildContourCircle(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, +GNEContour::buildContourCircle(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, const Position& pos, double radius, const double scale) const { // reset calculated shape myCalculatedShape->clear(); @@ -499,7 +499,7 @@ GNEContour::buildContourCircle(const GUIVisualizationSettings& s, const GUIVisua void -GNEContour::buildContourEdge(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, +GNEContour::buildContourEdge(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, const GNEEdge* edge, const bool closeFirstExtrem, const bool closeLastExtrem) const { // reset calculated shape myCalculatedShape->clear(); @@ -528,10 +528,10 @@ GNEContour::buildContourEdge(const GUIVisualizationSettings& s, const GUIVisuali }, false); } // update calculated shape - for (const auto &position : myDottedGeometries->at(0).getUnresampledShape()) { + for (const auto& position : myDottedGeometries->at(0).getUnresampledShape()) { myCalculatedShape->push_back(position); } - for (const auto &position : myDottedGeometries->at(2).getUnresampledShape()) { + for (const auto& position : myDottedGeometries->at(2).getUnresampledShape()) { myCalculatedShape->push_back(position); } // update contour boundary @@ -557,7 +557,7 @@ GNEContour::drawDottedContour(const GUIVisualizationSettings& s, GUIDottedGeomet // translate to front glTranslated(0, 0, GLO_DOTTEDCONTOUR); // draw dotted geometries - for (const auto &dottedGeometry : *myDottedGeometries) { + for (const auto& dottedGeometry : *myDottedGeometries) { dottedGeometry.drawDottedGeometry(s, type, myDottedGeometryColor, lineWidth, addOffset); } // pop matrix diff --git a/src/netedit/elements/GNEContour.h b/src/netedit/elements/GNEContour.h index 78a2dd2ea126..66935d8ec45c 100644 --- a/src/netedit/elements/GNEContour.h +++ b/src/netedit/elements/GNEContour.h @@ -78,7 +78,7 @@ class GNEContour { /// @brief calculate contour between two consecutive edges void calculateContourEdges(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, const GNEEdge* fromEdge, const GNEEdge* toEdge) const; - + /// @brief calculate contour for first geometry point void calculateContourFirstGeometryPoint(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, const GUIGlObject* glObject, const PositionVector& shape, const double radius, @@ -91,8 +91,8 @@ class GNEContour { /// @brief calculate contour for middle geometry point void calculateContourMiddleGeometryPoints(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const GUIGlObject* glObject, const PositionVector& shape, const double radius, - const double scale) const; + const GUIGlObject* glObject, const PositionVector& shape, const double radius, + const double scale) const; /// @brief calculate contour for all geometry points void calculateContourAllGeometryPoints(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, @@ -110,15 +110,15 @@ class GNEContour { /// @brief draw dotted contours (basics, select, delete, inspect...) void drawDottedContours(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const GNEAttributeCarrier *AC, const double lineWidth, const bool addOffset) const; + const GNEAttributeCarrier* AC, const double lineWidth, const bool addOffset) const; /// @brief draw dotted contour for geometry points void drawDottedContourGeometryPoints(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const GNEAttributeCarrier *AC, const PositionVector &shape, const double radius, + const GNEAttributeCarrier* AC, const PositionVector& shape, const double radius, const double scale, const double lineWidth) const; /// @brief draw innen contour (currently used only in walkingAreas) - void drawInnenContourClosed(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, + void drawInnenContourClosed(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, const PositionVector& shape, const double scale, const double lineWidth) const; /// @} @@ -127,10 +127,10 @@ class GNEContour { std::vector* myDottedGeometries; /// @brief contourboundary - Boundary *myContourBoundary; + Boundary* myContourBoundary; /// @brief calculated shape - PositionVector *myCalculatedShape; + PositionVector* myCalculatedShape; /// @brief dotted geometry color static GUIDottedGeometry::DottedGeometryColor myDottedGeometryColor; @@ -148,9 +148,9 @@ class GNEContour { const bool closeFirstExtrem, const bool closeLastExtrem, const double offset) const; /// @brief build contour around rectangle - void buildContourRectangle(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const Position& pos, const double width, const double height, const double offsetX, - const double offsetY, const double rot, const double scale) const; + void buildContourRectangle(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, + const Position& pos, const double width, const double height, const double offsetX, + const double offsetY, const double rot, const double scale) const; /// @brief build contour aorund circle void buildContourCircle(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, diff --git a/src/netedit/elements/additional/GNEAccess.cpp b/src/netedit/elements/additional/GNEAccess.cpp index c85f964e0fdf..ff7520685462 100644 --- a/src/netedit/elements/additional/GNEAccess.cpp +++ b/src/netedit/elements/additional/GNEAccess.cpp @@ -192,7 +192,7 @@ GNEAccess::checkDrawMoveContour() const { const auto& editModes = myNet->getViewNet()->getEditModes(); // check if we're in move mode if (!myNet->getViewNet()->isMovingElement() && editModes.isCurrentSupermodeNetwork() && - (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { + (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { // only move the first element return myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this; } else { @@ -224,7 +224,7 @@ GNEAccess::drawGL(const GUIVisualizationSettings& s) const { // draw geometry only if we'rent in drawForObjectUnderCursor mode if (!s.drawForViewObjectsHandler) { // radius depends if mouse is over element - const double radius = gViewObjectsHandler.isElementSelected(this)? 1 : 0.5; + const double radius = gViewObjectsHandler.isElementSelected(this) ? 1 : 0.5; // get color RGBColor accessColor; if (drawUsingSelectColor()) { diff --git a/src/netedit/elements/additional/GNEAdditional.cpp b/src/netedit/elements/additional/GNEAdditional.cpp index 27b4e8800f23..ab4b7e20f36f 100644 --- a/src/netedit/elements/additional/GNEAdditional.cpp +++ b/src/netedit/elements/additional/GNEAdditional.cpp @@ -835,10 +835,10 @@ GNEAdditional::drawListedAdditional(const GUIVisualizationSettings& s, const Pos bool GNEAdditional::drawMovingGeometryPoints(const bool ignoreShift) const { // get modes - const auto &modes = myNet->getViewNet()->getEditModes(); + const auto& modes = myNet->getViewNet()->getEditModes(); // check conditions if (modes.isCurrentSupermodeNetwork() && (modes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && - (ignoreShift || myNet->getViewNet()->getMouseButtonKeyPressed().shiftKeyPressed())) { + (ignoreShift || myNet->getViewNet()->getMouseButtonKeyPressed().shiftKeyPressed())) { return true; } else { return false; @@ -1005,16 +1005,16 @@ GNEAdditional::calculateContourPolygons(const GUIVisualizationSettings& s, const myAdditionalContour.calculateContourClosedShape(s, d, this, myAdditionalGeometry.getShape(), 1); } else { myAdditionalContour.calculateContourExtrudedShape(s, d, this, myAdditionalGeometry.getShape(), s.neteditSizeSettings.polylineWidth, - exaggeration, true, true, 0); + exaggeration, true, true, 0); } // get edit modes - const auto &editModes = myNet->getViewNet()->getEditModes(); + const auto& editModes = myNet->getViewNet()->getEditModes(); // check if draw geometry points if (editModes.isCurrentSupermodeNetwork() && !myNet->getViewNet()->getViewParent()->getMoveFrame()->getNetworkModeOptions()->getMoveWholePolygons()) { // check if we're in move mode const bool moveMode = (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE); // get geometry point radius (size depends if we're in move mode) - const double geometryPointRaidus = s.neteditSizeSettings.polygonGeometryPointRadius * (moveMode? 1 : 0.5); + const double geometryPointRaidus = s.neteditSizeSettings.polygonGeometryPointRadius * (moveMode ? 1 : 0.5); // calculate contour geometry points myAdditionalContour.calculateContourAllGeometryPoints(s, d, this, myAdditionalGeometry.getShape(), geometryPointRaidus, exaggeration, moveMode); } diff --git a/src/netedit/elements/additional/GNEBusStop.cpp b/src/netedit/elements/additional/GNEBusStop.cpp index 4e6ad471998e..2542f00c2c15 100644 --- a/src/netedit/elements/additional/GNEBusStop.cpp +++ b/src/netedit/elements/additional/GNEBusStop.cpp @@ -188,7 +188,7 @@ GNEBusStop::drawGL(const GUIVisualizationSettings& s) const { myAdditionalContour.drawDottedContours(s, d, this, s.dottedContourSettings.segmentWidth, true); // draw dotted contours for geometry points myAdditionalContour.drawDottedContourGeometryPoints(s, d, this, myAdditionalGeometry.getShape(), s.neteditSizeSettings.additionalGeometryPointRadius, - 1, s.dottedContourSettings.segmentWidthSmall); + 1, s.dottedContourSettings.segmentWidthSmall); } // draw demand element children drawDemandElementChildren(s); diff --git a/src/netedit/elements/additional/GNECalibrator.cpp b/src/netedit/elements/additional/GNECalibrator.cpp index 0e5be778baa5..9bc70781acec 100644 --- a/src/netedit/elements/additional/GNECalibrator.cpp +++ b/src/netedit/elements/additional/GNECalibrator.cpp @@ -267,13 +267,13 @@ GNECalibrator::drawGL(const GUIVisualizationSettings& s) const { } -bool +bool GNECalibrator::checkDrawMoveContour() const { // get edit modes const auto& editModes = myNet->getViewNet()->getEditModes(); // check if we're in move mode if (!myNet->getViewNet()->isMovingElement() && editModes.isCurrentSupermodeNetwork() && - (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { + (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { // only move the first element return myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this; } else { @@ -449,7 +449,7 @@ GNECalibrator::getHierarchyName() const { void GNECalibrator::drawCalibratorSymbol(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, const double exaggeration, - const Position& pos, const double rot) const { + const Position& pos, const double rot) const { // draw geometry only if we'rent in drawForObjectUnderCursor mode if (!s.drawForViewObjectsHandler) { // push layer matrix @@ -497,7 +497,7 @@ GNECalibrator::drawCalibratorSymbol(const GUIVisualizationSettings& s, const GUI } // draw dotted contour myAdditionalContour.calculateContourRectangleShape(s, d, this, pos, s.additionalSettings.calibratorWidth, - s.additionalSettings.calibratorHeight * 0.5, 0, 0, rot, exaggeration); + s.additionalSettings.calibratorHeight * 0.5, 0, 0, rot, exaggeration); } void diff --git a/src/netedit/elements/additional/GNEChargingStation.cpp b/src/netedit/elements/additional/GNEChargingStation.cpp index a35a8eb15ace..abda8af2828c 100644 --- a/src/netedit/elements/additional/GNEChargingStation.cpp +++ b/src/netedit/elements/additional/GNEChargingStation.cpp @@ -180,7 +180,7 @@ GNEChargingStation::drawGL(const GUIVisualizationSettings& s) const { myAdditionalContour.drawDottedContours(s, d, this, s.dottedContourSettings.segmentWidth, true); // draw dotted contours for geometry points myAdditionalContour.drawDottedContourGeometryPoints(s, d, this, myAdditionalGeometry.getShape(), s.neteditSizeSettings.additionalGeometryPointRadius, - 1, s.dottedContourSettings.segmentWidthSmall); + 1, s.dottedContourSettings.segmentWidthSmall); } // draw stoppingPlace children drawDemandElementChildren(s); diff --git a/src/netedit/elements/additional/GNEContainerStop.cpp b/src/netedit/elements/additional/GNEContainerStop.cpp index 7dc19815a1fe..15b11d90717c 100644 --- a/src/netedit/elements/additional/GNEContainerStop.cpp +++ b/src/netedit/elements/additional/GNEContainerStop.cpp @@ -177,7 +177,7 @@ GNEContainerStop::drawGL(const GUIVisualizationSettings& s) const { myAdditionalContour.drawDottedContours(s, d, this, s.dottedContourSettings.segmentWidth, true); // draw dotted contours for geometry points myAdditionalContour.drawDottedContourGeometryPoints(s, d, this, myAdditionalGeometry.getShape(), s.neteditSizeSettings.additionalGeometryPointRadius, - 1, s.dottedContourSettings.segmentWidthSmall); + 1, s.dottedContourSettings.segmentWidthSmall); } // draw demand element children drawDemandElementChildren(s); diff --git a/src/netedit/elements/additional/GNEDetector.cpp b/src/netedit/elements/additional/GNEDetector.cpp index b148d34eedd3..e9d3735794c8 100644 --- a/src/netedit/elements/additional/GNEDetector.cpp +++ b/src/netedit/elements/additional/GNEDetector.cpp @@ -91,7 +91,7 @@ GNEDetector::checkDrawMoveContour() const { const auto& editModes = myNet->getViewNet()->getEditModes(); // check if we're in move mode if (!myNet->getViewNet()->isMovingElement() && editModes.isCurrentSupermodeNetwork() && - (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { + (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { // only move the first element return myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this; } else { diff --git a/src/netedit/elements/additional/GNEEntryExitDetector.cpp b/src/netedit/elements/additional/GNEEntryExitDetector.cpp index 7e641cf2dfec..e23fbeda77b8 100644 --- a/src/netedit/elements/additional/GNEEntryExitDetector.cpp +++ b/src/netedit/elements/additional/GNEEntryExitDetector.cpp @@ -162,7 +162,7 @@ GNEEntryExitDetector::drawGL(const GUIVisualizationSettings& s) const { } // calculate contour myAdditionalContour.calculateContourRectangleShape(s, d, this, myAdditionalGeometry.getShape().front(), 2.7, 1.6, 2, 0, - myAdditionalGeometry.getShapeRotations().front(), entryExitExaggeration); + myAdditionalGeometry.getShapeRotations().front(), entryExitExaggeration); } } @@ -244,7 +244,7 @@ GNEEntryExitDetector::isValid(SumoXMLAttr key, const std::string& value) { void GNEEntryExitDetector::drawBody(const GUIVisualizationSettings::Detail d, - const RGBColor &color, const double exaggeration) const { + const RGBColor& color, const double exaggeration) const { // check detail level if (d <= GUIVisualizationSettings::Detail::Additionals) { // Push polygon matrix @@ -297,7 +297,7 @@ GNEEntryExitDetector::drawBody(const GUIVisualizationSettings::Detail d, void GNEEntryExitDetector::drawEntryLogo(const GUIVisualizationSettings::Detail d, - const RGBColor &color, const double exaggeration) const { + const RGBColor& color, const double exaggeration) const { // check detail level if (d <= GUIVisualizationSettings::Detail::AdditionalDetails) { // Push matrix @@ -334,7 +334,7 @@ GNEEntryExitDetector::drawEntryLogo(const GUIVisualizationSettings::Detail d, void GNEEntryExitDetector::drawE3Logo(const GUIVisualizationSettings::Detail d, - const RGBColor &color, const double exaggeration) const { + const RGBColor& color, const double exaggeration) const { // check detail level if (d <= GUIVisualizationSettings::Detail::Text) { // Push matrix diff --git a/src/netedit/elements/additional/GNEEntryExitDetector.h b/src/netedit/elements/additional/GNEEntryExitDetector.h index 4c60e59e89ab..5eaa3d6a1b06 100644 --- a/src/netedit/elements/additional/GNEEntryExitDetector.h +++ b/src/netedit/elements/additional/GNEEntryExitDetector.h @@ -120,13 +120,13 @@ class GNEEntryExitDetector : public GNEDetector { private: /// @brief draw body - void drawBody(const GUIVisualizationSettings::Detail d, const RGBColor &color, const double exaggeration) const; + void drawBody(const GUIVisualizationSettings::Detail d, const RGBColor& color, const double exaggeration) const; /// @brief draw entry logo - void drawEntryLogo(const GUIVisualizationSettings::Detail d, const RGBColor &color, const double exaggeration) const; + void drawEntryLogo(const GUIVisualizationSettings::Detail d, const RGBColor& color, const double exaggeration) const; /// @brief draw E3 logo - void drawE3Logo(const GUIVisualizationSettings::Detail d, const RGBColor &color, const double exaggeration) const; + void drawE3Logo(const GUIVisualizationSettings::Detail d, const RGBColor& color, const double exaggeration) const; /// @brief set attribute after validation void setAttribute(SumoXMLAttr key, const std::string& value); diff --git a/src/netedit/elements/additional/GNEInductionLoopDetector.cpp b/src/netedit/elements/additional/GNEInductionLoopDetector.cpp index 6477943d82ba..ee4fad39ef49 100644 --- a/src/netedit/elements/additional/GNEInductionLoopDetector.cpp +++ b/src/netedit/elements/additional/GNEInductionLoopDetector.cpp @@ -200,7 +200,7 @@ GNEInductionLoopDetector::drawGL(const GUIVisualizationSettings& s) const { } // calculate contour rectangle myAdditionalContour.calculateContourRectangleShape(s, d, this, myAdditionalGeometry.getShape().front(), 2, 1, 0, 0, - myAdditionalGeometry.getShapeRotations().front(), E1Exaggeration); + myAdditionalGeometry.getShapeRotations().front(), E1Exaggeration); } } diff --git a/src/netedit/elements/additional/GNEInstantInductionLoopDetector.cpp b/src/netedit/elements/additional/GNEInstantInductionLoopDetector.cpp index 602b4972c26c..866bce32302b 100644 --- a/src/netedit/elements/additional/GNEInstantInductionLoopDetector.cpp +++ b/src/netedit/elements/additional/GNEInstantInductionLoopDetector.cpp @@ -140,7 +140,7 @@ void GNEInstantInductionLoopDetector::drawGL(const GUIVisualizationSettings& s) const { // check if additional has to be drawn if (myNet->getViewNet()->getDataViewOptions().showAdditionals() && - !myNet->getViewNet()->selectingDetectorsTLSMode()) { + !myNet->getViewNet()->selectingDetectorsTLSMode()) { // Obtain exaggeration of the draw const double E1InstantExaggeration = getExaggeration(s); // get detail level @@ -182,7 +182,7 @@ GNEInstantInductionLoopDetector::drawGL(const GUIVisualizationSettings& s) const } // draw dotted contour myAdditionalContour.calculateContourRectangleShape(s, d, this, myAdditionalGeometry.getShape().front(), 2, 1, 0, 0, - myAdditionalGeometry.getShapeRotations().front(), E1InstantExaggeration); + myAdditionalGeometry.getShapeRotations().front(), E1InstantExaggeration); } } diff --git a/src/netedit/elements/additional/GNELaneAreaDetector.cpp b/src/netedit/elements/additional/GNELaneAreaDetector.cpp index 4a35ac82da5d..9ce00700decb 100644 --- a/src/netedit/elements/additional/GNELaneAreaDetector.cpp +++ b/src/netedit/elements/additional/GNELaneAreaDetector.cpp @@ -351,7 +351,7 @@ GNELaneAreaDetector::drawLanePartialGL(const GUIVisualizationSettings& s, const } // calculate contour and draw dotted geometry myAdditionalContour.calculateContourExtrudedShape(s, d, this, E2Geometry.getShape(), s.detectorSettings.E2Width, E2Exaggeration, - segment->isFirstSegment(), segment->isLastSegment(), 0); + segment->isFirstSegment(), segment->isLastSegment(), 0); } } @@ -370,8 +370,8 @@ GNELaneAreaDetector::drawJunctionPartialGL(const GUIVisualizationSettings& s, co // check if connection to next lane exist const bool connectionExist = segment->getPreviousLane()->getLane2laneConnections().exist(segment->getNextLane()); // get geometry - const GUIGeometry& E2Geometry = connectionExist? segment->getPreviousLane()->getLane2laneConnections().getLane2laneGeometry(segment->getNextLane()) : - GUIGeometry({segment->getPreviousLane()->getLaneShape().back(), segment->getNextLane()->getLaneShape().front()}); + const GUIGeometry& E2Geometry = connectionExist ? segment->getPreviousLane()->getLane2laneConnections().getLane2laneGeometry(segment->getNextLane()) : + GUIGeometry({segment->getPreviousLane()->getLaneShape().back(), segment->getNextLane()->getLaneShape().front()}); // draw geometry only if we'rent in drawForObjectUnderCursor mode if (!s.drawForViewObjectsHandler) { // draw E2 partial @@ -585,7 +585,7 @@ GNELaneAreaDetector::drawE2(const GUIVisualizationSettings& s, const GUIVisualiz void GNELaneAreaDetector::drawE2PartialLane(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, const GNEPathManager::Segment* segment, const double offsetFront, - const GUIGeometry &geometry, const double exaggeration) const { + const GUIGeometry& geometry, const double exaggeration) const { // obtain color const RGBColor E2Color = drawUsingSelectColor() ? s.colorSettings.selectedAdditionalColor : s.detectorSettings.E2Color; // push layer matrix @@ -641,10 +641,10 @@ GNELaneAreaDetector::drawE2PartialLane(const GUIVisualizationSettings& s, const void GNELaneAreaDetector::drawE2PartialJunction(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const bool onlyContour, const double offsetFront, const GUIGeometry &geometry, - const double exaggeration) const { + const bool onlyContour, const double offsetFront, const GUIGeometry& geometry, + const double exaggeration) const { const bool invalid = geometry.getShape().length() == 2; - const double width = s.detectorSettings.E2Width * exaggeration * (invalid? 0.5 : 1); + const double width = s.detectorSettings.E2Width * exaggeration * (invalid ? 0.5 : 1); // Add a draw matrix GLHelper::pushMatrix(); // Start with the drawing of the area traslating matrix to origin diff --git a/src/netedit/elements/additional/GNELaneAreaDetector.h b/src/netedit/elements/additional/GNELaneAreaDetector.h index 4fb767566cd9..1063670901c6 100644 --- a/src/netedit/elements/additional/GNELaneAreaDetector.h +++ b/src/netedit/elements/additional/GNELaneAreaDetector.h @@ -189,12 +189,12 @@ class GNELaneAreaDetector : public GNEDetector { /// @brief draw E2 partial lane void drawE2PartialLane(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const GNEPathManager::Segment* segment, const double offsetFront, - const GUIGeometry &geometry, const double exaggeration) const; + const GNEPathManager::Segment* segment, const double offsetFront, + const GUIGeometry& geometry, const double exaggeration) const; /// @brief draw E2 partial junction void drawE2PartialJunction(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const bool onlyContour, const double offsetFront, const GUIGeometry &geometry, + const bool onlyContour, const double offsetFront, const GUIGeometry& geometry, const double exaggeration) const; /// @brief set attribute after validation diff --git a/src/netedit/elements/additional/GNEMultiEntryExitDetector.cpp b/src/netedit/elements/additional/GNEMultiEntryExitDetector.cpp index 398a211a31ad..16f1cfe234b3 100644 --- a/src/netedit/elements/additional/GNEMultiEntryExitDetector.cpp +++ b/src/netedit/elements/additional/GNEMultiEntryExitDetector.cpp @@ -141,7 +141,7 @@ GNEMultiEntryExitDetector::checkDrawMoveContour() const { const auto& editModes = myNet->getViewNet()->getEditModes(); // check if we're in move mode if (!myNet->getViewNet()->isMovingElement() && editModes.isCurrentSupermodeNetwork() && - (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { + (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { // only move the first element return myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this; } else { diff --git a/src/netedit/elements/additional/GNEPOI.cpp b/src/netedit/elements/additional/GNEPOI.cpp index 0ac4982e0c7b..0219a084a7f1 100644 --- a/src/netedit/elements/additional/GNEPOI.cpp +++ b/src/netedit/elements/additional/GNEPOI.cpp @@ -305,7 +305,7 @@ GNEPOI::checkDrawMoveContour() const { const auto& editModes = myNet->getViewNet()->getEditModes(); // check if we're in move mode if (!myNet->getViewNet()->isMovingElement() && editModes.isCurrentSupermodeNetwork() && - (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { + (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { // only move the first element return myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this; } else { @@ -576,10 +576,10 @@ GNEPOI::drawPOI(const GUIVisualizationSettings& s, const GUIVisualizationSetting // draw inner polygon if (myNet->getViewNet()->getFrontAttributeCarrier() == this) { GUIPointOfInterest::drawInnerPOI(s, this, this, drawUsingSelectColor(), GLO_FRONTELEMENT, - myShapeWidth.length2D(), myShapeHeight.length2D()); + myShapeWidth.length2D(), myShapeHeight.length2D()); } else { GUIPointOfInterest::drawInnerPOI(s, this, this, drawUsingSelectColor(), getShapeLayer(), - myShapeWidth.length2D(), myShapeHeight.length2D()); + myShapeWidth.length2D(), myShapeHeight.length2D()); } // draw an orange square mode if there is an image(see #4036) if (!getShapeImgFile().empty() && OptionsCont::getOptions().getBool("gui-testing")) { diff --git a/src/netedit/elements/additional/GNEParkingArea.cpp b/src/netedit/elements/additional/GNEParkingArea.cpp index d9eb8f83fe23..a3399be51d6b 100644 --- a/src/netedit/elements/additional/GNEParkingArea.cpp +++ b/src/netedit/elements/additional/GNEParkingArea.cpp @@ -213,7 +213,7 @@ GNEParkingArea::drawGL(const GUIVisualizationSettings& s) const { myAdditionalContour.drawDottedContours(s, d, this, s.dottedContourSettings.segmentWidth, true); // draw dotted contours for geometry points myAdditionalContour.drawDottedContourGeometryPoints(s, d, this, myAdditionalGeometry.getShape(), s.neteditSizeSettings.additionalGeometryPointRadius, - 1, s.dottedContourSettings.segmentWidthSmall); + 1, s.dottedContourSettings.segmentWidthSmall); } // draw demand element children drawDemandElementChildren(s); diff --git a/src/netedit/elements/additional/GNEParkingSpace.cpp b/src/netedit/elements/additional/GNEParkingSpace.cpp index ef4686704eb9..3095abeab960 100644 --- a/src/netedit/elements/additional/GNEParkingSpace.cpp +++ b/src/netedit/elements/additional/GNEParkingSpace.cpp @@ -139,7 +139,7 @@ GNEParkingSpace::checkDrawMoveContour() const { const auto& editModes = myNet->getViewNet()->getEditModes(); // check if we're in move mode if (!myNet->getViewNet()->isMovingElement() && editModes.isCurrentSupermodeNetwork() && - (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { + (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { // only move the first element return myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this; } else { diff --git a/src/netedit/elements/additional/GNEPoly.cpp b/src/netedit/elements/additional/GNEPoly.cpp index 1df89d1f0917..5b17f8802b91 100644 --- a/src/netedit/elements/additional/GNEPoly.cpp +++ b/src/netedit/elements/additional/GNEPoly.cpp @@ -234,7 +234,7 @@ GNEPoly::checkDrawMoveContour() const { const auto& editModes = myNet->getViewNet()->getEditModes(); // check if we're in move mode if (!myNet->getViewNet()->isMovingElement() && editModes.isCurrentSupermodeNetwork() && - (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { + (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { // only move the first element return myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this; } else { @@ -828,7 +828,7 @@ GNEPoly::commitMoveShape(const GNEMoveResult& moveResult, GNEUndoList* undoList) void GNEPoly::drawPolygon(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const RGBColor &color, const double exaggeration) const { + const RGBColor& color, const double exaggeration) const { // check if we're drawing a polygon or a polyline if (getFill()) { // draw inner polygon @@ -848,7 +848,7 @@ GNEPoly::drawPolygon(const GUIVisualizationSettings& s, const GUIVisualizationSe void GNEPoly::drawPolygonContour(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const RGBColor &color, const double exaggeration) const { + const RGBColor& color, const double exaggeration) const { // push contour matrix GLHelper::pushMatrix(); // translate to front @@ -864,7 +864,7 @@ GNEPoly::drawPolygonContour(const GUIVisualizationSettings& s, const GUIVisualiz void GNEPoly::drawGeometryPoints(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const RGBColor &color, const double exaggeration) const { + const RGBColor& color, const double exaggeration) const { // draw shape points only in supermode network if (myNet->getViewNet()->getEditModes().isCurrentSupermodeNetwork()) { // check if we're in move mode @@ -877,7 +877,7 @@ GNEPoly::drawGeometryPoints(const GUIVisualizationSettings& s, const GUIVisualiz // draw dotted contours for geometry points if we're in move mode if (moveMode) { myAdditionalContour.drawDottedContourGeometryPoints(s, d, this, myAdditionalGeometry.getShape(), geometryPointSize, - exaggeration, s.dottedContourSettings.segmentWidthSmall); + exaggeration, s.dottedContourSettings.segmentWidthSmall); } } } diff --git a/src/netedit/elements/additional/GNEPoly.h b/src/netedit/elements/additional/GNEPoly.h index e8441f71a384..8c83ccb92c1c 100644 --- a/src/netedit/elements/additional/GNEPoly.h +++ b/src/netedit/elements/additional/GNEPoly.h @@ -250,15 +250,15 @@ class GNEPoly : public TesselatedPolygon, public GNEAdditional { /// @brief draw polygon void drawPolygon(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const RGBColor &color, const double exaggeration) const; + const RGBColor& color, const double exaggeration) const; /// @brief draw contour void drawPolygonContour(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const RGBColor &color, const double exaggeration) const; + const RGBColor& color, const double exaggeration) const; /// @brief draw geometry points void drawGeometryPoints(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const RGBColor &color, const double exaggeration) const; + const RGBColor& color, const double exaggeration) const; /// @brief draw polygon name and type void drawPolygonNameAndType(const GUIVisualizationSettings& s) const; diff --git a/src/netedit/elements/additional/GNERerouter.cpp b/src/netedit/elements/additional/GNERerouter.cpp index 25f976a3fdb0..0a2792621306 100644 --- a/src/netedit/elements/additional/GNERerouter.cpp +++ b/src/netedit/elements/additional/GNERerouter.cpp @@ -124,7 +124,7 @@ GNERerouter::checkDrawMoveContour() const { const auto& editModes = myNet->getViewNet()->getEditModes(); // check if we're in move mode if (!myNet->getViewNet()->isMovingElement() && editModes.isCurrentSupermodeNetwork() && - (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { + (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { // only move the first element return myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this; } else { @@ -170,19 +170,19 @@ GNERerouter::updateCenteringBoundary(const bool updateGrid) { updateGeometry(); // add shape boundary myAdditionalBoundary = myAdditionalGeometry.getShape().getBoxBoundary(); -/* - // add positions of all childrens (intervals and symbols) - for (const auto& additionalChildren : getChildAdditionals()) { - myAdditionalBoundary.add(additionalChildren->getPositionInView()); - for (const auto& rerouterElement : additionalChildren->getChildAdditionals()) { - myAdditionalBoundary.add(rerouterElement->getPositionInView()); - // special case for parking area rerouter - if (rerouterElement->getTagProperty().getTag() == SUMO_TAG_PARKING_AREA_REROUTE) { - myAdditionalBoundary.add(rerouterElement->getParentAdditionals().at(1)->getCenteringBoundary()); + /* + // add positions of all childrens (intervals and symbols) + for (const auto& additionalChildren : getChildAdditionals()) { + myAdditionalBoundary.add(additionalChildren->getPositionInView()); + for (const auto& rerouterElement : additionalChildren->getChildAdditionals()) { + myAdditionalBoundary.add(rerouterElement->getPositionInView()); + // special case for parking area rerouter + if (rerouterElement->getTagProperty().getTag() == SUMO_TAG_PARKING_AREA_REROUTE) { + myAdditionalBoundary.add(rerouterElement->getParentAdditionals().at(1)->getCenteringBoundary()); + } } } - } -*/ + */ // grow myAdditionalBoundary.grow(5); // add additional into RTREE again diff --git a/src/netedit/elements/additional/GNERerouterSymbol.cpp b/src/netedit/elements/additional/GNERerouterSymbol.cpp index 012a6068f35f..cc80ee864c42 100644 --- a/src/netedit/elements/additional/GNERerouterSymbol.cpp +++ b/src/netedit/elements/additional/GNERerouterSymbol.cpp @@ -87,7 +87,7 @@ GNERerouterSymbol::checkDrawMoveContour() const { const auto& editModes = myNet->getViewNet()->getEditModes(); // check if we're in move mode if (!myNet->getViewNet()->isMovingElement() && editModes.isCurrentSupermodeNetwork() && - (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { + (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { // only move the first element return myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this; } else { @@ -165,7 +165,7 @@ GNERerouterSymbol::drawGL(const GUIVisualizationSettings& s) const { // calculate contour rectangle shape for (const auto& symbolGeometry : mySymbolGeometries) { myAdditionalContour.calculateContourRectangleShape(s, d, this, symbolGeometry.getShape().front(), 1, 3, 0, 3, - symbolGeometry.getShapeRotations().front() + 90, rerouteExaggeration); + symbolGeometry.getShapeRotations().front() + 90, rerouteExaggeration); } } } diff --git a/src/netedit/elements/additional/GNEStoppingPlace.cpp b/src/netedit/elements/additional/GNEStoppingPlace.cpp index 6b2ea392f5c7..f2b73f2c2c83 100644 --- a/src/netedit/elements/additional/GNEStoppingPlace.cpp +++ b/src/netedit/elements/additional/GNEStoppingPlace.cpp @@ -159,7 +159,7 @@ GNEStoppingPlace::checkDrawMoveContour() const { const auto& editModes = myNet->getViewNet()->getEditModes(); // check if we're in move mode if (!myNet->getViewNet()->isMovingElement() && editModes.isCurrentSupermodeNetwork() && - (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { + (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { // only move the first element return myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this; } else { @@ -323,7 +323,7 @@ GNEStoppingPlace::drawLines(const GUIVisualizationSettings::Detail d, const std: void GNEStoppingPlace::drawSign(const GUIVisualizationSettings::Detail d, const double exaggeration, const RGBColor& baseColor, - const RGBColor& signColor, const std::string& word) const { + const RGBColor& signColor, const std::string& word) const { // only draw in level 2 if (d <= GUIVisualizationSettings::Detail::AdditionalDetails) { // calculate middle point @@ -361,16 +361,16 @@ GNEStoppingPlace::drawSign(const GUIVisualizationSettings::Detail d, const doubl void GNEStoppingPlace::calculateStoppingPlaceContour(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const double width, const bool movingGeometryPoints) const { + const double width, const bool movingGeometryPoints) const { // check if we're calculating the contour or the moving geometry points if (movingGeometryPoints) { if (myStartPosition != INVALID_DOUBLE) { myAdditionalContour.calculateContourFirstGeometryPoint(s, d, this, myAdditionalGeometry.getShape(), - s.neteditSizeSettings.additionalGeometryPointRadius, 1); + s.neteditSizeSettings.additionalGeometryPointRadius, 1); } if (movingGeometryPoints && (myEndPosition != INVALID_DOUBLE)) { myAdditionalContour.calculateContourLastGeometryPoint(s, d, this, myAdditionalGeometry.getShape(), - s.neteditSizeSettings.additionalGeometryPointRadius, 1); + s.neteditSizeSettings.additionalGeometryPointRadius, 1); } } else { // don't exaggerate contour diff --git a/src/netedit/elements/additional/GNETAZ.cpp b/src/netedit/elements/additional/GNETAZ.cpp index bbd578dd25ac..56f57a86906f 100644 --- a/src/netedit/elements/additional/GNETAZ.cpp +++ b/src/netedit/elements/additional/GNETAZ.cpp @@ -48,13 +48,13 @@ const double GNETAZ::myHintSizeSquared = 0.64; GNETAZ::GNETAZ(GNENet* net) : GNEAdditional("", net, GLO_TAZ, SUMO_TAG_TAZ, GUIIconSubSys::getIcon(GUIIcon::TAZ), "", {}, {}, {}, {}, {}, {}), - TesselatedPolygon("", "", RGBColor::BLACK, {}, false, false, 1, Shape::DEFAULT_LAYER, Shape::DEFAULT_ANGLE, Shape::DEFAULT_IMG_FILE, Shape::DEFAULT_RELATIVEPATH, ""), - myMaxWeightSource(0), - myMinWeightSource(0), - myAverageWeightSource(0), - myMaxWeightSink(0), - myMinWeightSink(0), - myAverageWeightSink(0) { + TesselatedPolygon("", "", RGBColor::BLACK, {}, false, false, 1, Shape::DEFAULT_LAYER, Shape::DEFAULT_ANGLE, Shape::DEFAULT_IMG_FILE, Shape::DEFAULT_RELATIVEPATH, ""), + myMaxWeightSource(0), + myMinWeightSource(0), + myAverageWeightSource(0), + myMaxWeightSink(0), + myMinWeightSink(0), +myAverageWeightSink(0) { // reset default values resetDefaultValues(); } @@ -63,14 +63,14 @@ GNETAZ::GNETAZ(GNENet* net) : GNETAZ::GNETAZ(const std::string& id, GNENet* net, const PositionVector& shape, const Position& center, const bool fill, const RGBColor& color, const std::string& name, const Parameterised::Map& parameters) : GNEAdditional(id, net, GLO_TAZ, SUMO_TAG_TAZ, GUIIconSubSys::getIcon(GUIIcon::TAZ), "", {}, {}, {}, {}, {}, {}), - TesselatedPolygon(id, "", color, shape, false, fill, 1, Shape::DEFAULT_LAYER, Shape::DEFAULT_ANGLE, Shape::DEFAULT_IMG_FILE, Shape::DEFAULT_RELATIVEPATH, name, parameters), - myTAZCenter(center), - myMaxWeightSource(0), - myMinWeightSource(0), - myAverageWeightSource(0), - myMaxWeightSink(0), - myMinWeightSink(0), - myAverageWeightSink(0) { +TesselatedPolygon(id, "", color, shape, false, fill, 1, Shape::DEFAULT_LAYER, Shape::DEFAULT_ANGLE, Shape::DEFAULT_IMG_FILE, Shape::DEFAULT_RELATIVEPATH, name, parameters), +myTAZCenter(center), +myMaxWeightSource(0), +myMinWeightSource(0), +myAverageWeightSource(0), +myMaxWeightSink(0), +myMinWeightSink(0), +myAverageWeightSink(0) { // update centering boundary without updating grid updateCenteringBoundary(false); // update geometry @@ -206,7 +206,7 @@ GNETAZ::checkDrawMoveContour() const { const auto& editModes = myNet->getViewNet()->getEditModes(); // check if we're in move mode if (!myNet->getViewNet()->isMovingElement() && editModes.isCurrentSupermodeNetwork() && - (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { + (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { // only move the first element return myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this; } else { @@ -361,7 +361,7 @@ GNETAZ::drawGL(const GUIVisualizationSettings& s) const { // draw dotted contours for geometry points if we're in move mode if (moveMode) { myAdditionalContour.drawDottedContourGeometryPoints(s, d, this, myAdditionalGeometry.getShape(), geometryPointSize, - TAZExaggeration, s.dottedContourSettings.segmentWidthSmall); + TAZExaggeration, s.dottedContourSettings.segmentWidthSmall); } } } diff --git a/src/netedit/elements/additional/GNETractionSubstation.cpp b/src/netedit/elements/additional/GNETractionSubstation.cpp index 774e1fca1e3c..78646c4ee4e0 100644 --- a/src/netedit/elements/additional/GNETractionSubstation.cpp +++ b/src/netedit/elements/additional/GNETractionSubstation.cpp @@ -97,7 +97,7 @@ GNETractionSubstation::checkDrawMoveContour() const { const auto& editModes = myNet->getViewNet()->getEditModes(); // check if we're in move mode if (!myNet->getViewNet()->isMovingElement() && editModes.isCurrentSupermodeNetwork() && - (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { + (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { // only move the first element return myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this; } else { diff --git a/src/netedit/elements/additional/GNEVariableSpeedSign.cpp b/src/netedit/elements/additional/GNEVariableSpeedSign.cpp index d375e0f01008..5034076b67ed 100644 --- a/src/netedit/elements/additional/GNEVariableSpeedSign.cpp +++ b/src/netedit/elements/additional/GNEVariableSpeedSign.cpp @@ -157,7 +157,7 @@ GNEVariableSpeedSign::checkDrawMoveContour() const { const auto& editModes = myNet->getViewNet()->getEditModes(); // check if we're in move mode if (!myNet->getViewNet()->isMovingElement() && editModes.isCurrentSupermodeNetwork() && - (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { + (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { // only move the first element return myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this; } else { diff --git a/src/netedit/elements/additional/GNEVariableSpeedSignSymbol.cpp b/src/netedit/elements/additional/GNEVariableSpeedSignSymbol.cpp index 3fd0b5984e54..067a97c5c805 100644 --- a/src/netedit/elements/additional/GNEVariableSpeedSignSymbol.cpp +++ b/src/netedit/elements/additional/GNEVariableSpeedSignSymbol.cpp @@ -195,7 +195,7 @@ GNEVariableSpeedSignSymbol::getHierarchyName() const { void GNEVariableSpeedSignSymbol::drawVSSSymbol(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const double exaggeration) const { + const double exaggeration) const { // start drawing symbol GLHelper::pushMatrix(); // translate to front diff --git a/src/netedit/elements/demand/GNEContainer.cpp b/src/netedit/elements/demand/GNEContainer.cpp index f7f5828ce5e3..d224102ff9f0 100644 --- a/src/netedit/elements/demand/GNEContainer.cpp +++ b/src/netedit/elements/demand/GNEContainer.cpp @@ -160,7 +160,7 @@ GNEContainer::GNESelectedContainersPopupMenu::onCmdTransform(FXObject* obj, FXSe GNEContainer::GNEContainer(SumoXMLTag tag, GNENet* net) : GNEDemandElement("", net, GLO_CONTAINER, tag, GUIIconSubSys::getIcon(GUIIcon::CONTAINER), GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {}, {}, {}, {}, {}), - GNEDemandElementFlow(this) { +GNEDemandElementFlow(this) { // reset default values resetDefaultValues(); // set end and container per hours as default flow values @@ -173,7 +173,7 @@ GNEContainer::GNEContainer(SumoXMLTag tag, GNENet* net, GNEDemandElement* pType, GNEDemandElement(containerparameters.id, net, (tag == SUMO_TAG_CONTAINERFLOW) ? GLO_CONTAINERFLOW : GLO_CONTAINER, tag, (tag == SUMO_TAG_CONTAINERFLOW) ? GUIIconSubSys::getIcon(GUIIcon::CONTAINERFLOW) : GUIIconSubSys::getIcon(GUIIcon::CONTAINER), GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {}, {}, {}, {pType}, {}), - GNEDemandElementFlow(this, containerparameters) { +GNEDemandElementFlow(this, containerparameters) { // set manually vtypeID (needed for saving) vtypeid = pType->getID(); } diff --git a/src/netedit/elements/demand/GNEDemandElement.cpp b/src/netedit/elements/demand/GNEDemandElement.cpp index e1441b567eb6..096d09de04c3 100644 --- a/src/netedit/elements/demand/GNEDemandElement.cpp +++ b/src/netedit/elements/demand/GNEDemandElement.cpp @@ -242,7 +242,7 @@ GNEDemandElement::checkDrawMoveContour() const { const auto& editModes = myNet->getViewNet()->getEditModes(); // check if we're in select mode if (!myNet->getViewNet()->isMovingElement() && editModes.isCurrentSupermodeDemand() && - (editModes.demandEditMode == DemandEditMode::DEMAND_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { + (editModes.demandEditMode == DemandEditMode::DEMAND_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { // only move the first element return myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this; } else { diff --git a/src/netedit/elements/demand/GNEPerson.cpp b/src/netedit/elements/demand/GNEPerson.cpp index 15643657e894..54859a24baa2 100644 --- a/src/netedit/elements/demand/GNEPerson.cpp +++ b/src/netedit/elements/demand/GNEPerson.cpp @@ -160,7 +160,7 @@ GNEPerson::GNESelectedPersonsPopupMenu::onCmdTransform(FXObject* obj, FXSelector GNEPerson::GNEPerson(SumoXMLTag tag, GNENet* net) : GNEDemandElement("", net, GLO_PERSON, tag, GUIIconSubSys::getIcon(GUIIcon::PERSON), GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {}, {}, {}, {}, {}), - GNEDemandElementFlow(this) { +GNEDemandElementFlow(this) { // reset default values resetDefaultValues(); // enable set and persons per hour as default flow values @@ -173,7 +173,7 @@ GNEPerson::GNEPerson(SumoXMLTag tag, GNENet* net, GNEDemandElement* pType, const GNEDemandElement(personparameters.id, net, (tag == SUMO_TAG_PERSONFLOW) ? GLO_PERSONFLOW : GLO_PERSON, tag, (tag == SUMO_TAG_PERSONFLOW) ? GUIIconSubSys::getIcon(GUIIcon::PERSONFLOW) : GUIIconSubSys::getIcon(GUIIcon::PERSON), GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {}, {}, {}, {pType}, {}), - GNEDemandElementFlow(this, personparameters) { +GNEDemandElementFlow(this, personparameters) { // set manually vtypeID (needed for saving) vtypeid = pType->getID(); } @@ -381,7 +381,7 @@ GNEPerson::drawGL(const GUIVisualizationSettings& s) const { if (myStackedLabelNumber > 0) { drawStackLabel(myStackedLabelNumber, "person", Position(personPosition.x() - 2.5, personPosition.y()), -90, 1.3, 5, getExaggeration(s)); } else if ((getChildDemandElements().front()->getTagProperty().getTag() == GNE_TAG_STOPPERSON_BUSSTOP) || - (getChildDemandElements().front()->getTagProperty().getTag() == GNE_TAG_STOPPERSON_TRAINSTOP)) { + (getChildDemandElements().front()->getTagProperty().getTag() == GNE_TAG_STOPPERSON_TRAINSTOP)) { // declare counter for stacked persons over stops int stackedCounter = 0; // get stoppingPlace diff --git a/src/netedit/elements/demand/GNERoute.cpp b/src/netedit/elements/demand/GNERoute.cpp index 3afccaea769e..7b1da5c0be8c 100644 --- a/src/netedit/elements/demand/GNERoute.cpp +++ b/src/netedit/elements/demand/GNERoute.cpp @@ -468,7 +468,7 @@ GNERoute::drawLanePartialGL(const GUIVisualizationSettings& s, const GNEPathMana } // calculate contour segment->getContour()->calculateContourExtrudedShape(s, d, this, routeGeometry.getShape(), routeWidth, exaggeration, - segment->isFirstSegment(), segment->isLastSegment(), 0); + segment->isFirstSegment(), segment->isLastSegment(), 0); } } @@ -479,17 +479,17 @@ GNERoute::drawJunctionPartialGL(const GUIVisualizationSettings& s, const GNEPath if (myNet->getViewNet()->getNetworkViewOptions().showDemandElements() && myNet->getViewNet()->getDataViewOptions().showDemandElements() && myNet->getViewNet()->getDemandViewOptions().showNonInspectedDemandElements(this) && myNet->getPathManager()->getPathDraw()->checkDrawPathGeometry(s, segment, myTagProperty.getTag())) { - // Obtain exaggeration of the draw + // Obtain exaggeration of the draw const double routeExaggeration = getExaggeration(s); // get detail level const auto d = s.getDetailLevel(routeExaggeration); - // get route width + // get route width const double routeWidth = (myTagProperty.getTag() == GNE_TAG_ROUTE_EMBEDDED) ? s.widthSettings.embeddedRouteWidth : s.widthSettings.routeWidth; // check if connection to next lane exist const bool connectionExist = segment->getPreviousLane()->getLane2laneConnections().exist(segment->getNextLane()); // get geometry - const GUIGeometry& routeGeometry = connectionExist? segment->getPreviousLane()->getLane2laneConnections().getLane2laneGeometry(segment->getNextLane()) : - GUIGeometry({segment->getPreviousLane()->getLaneShape().back(), segment->getNextLane()->getLaneShape().front()}); + const GUIGeometry& routeGeometry = connectionExist ? segment->getPreviousLane()->getLane2laneConnections().getLane2laneGeometry(segment->getNextLane()) : + GUIGeometry({segment->getPreviousLane()->getLaneShape().back(), segment->getNextLane()->getLaneShape().front()}); // draw geometry only if we'rent in drawForObjectUnderCursor mode if (!s.drawForViewObjectsHandler) { // draw route partial @@ -749,7 +749,7 @@ GNERoute::copyRoute(const GNERoute* originalRoute) { void GNERoute::drawRoutePartialLane(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, const GNEPathManager::Segment* segment, const double offsetFront, - const GUIGeometry &geometry, const double exaggeration) const { + const GUIGeometry& geometry, const double exaggeration) const { // get route width const double routeWidth = (myTagProperty.getTag() == GNE_TAG_ROUTE_EMBEDDED) ? s.widthSettings.embeddedRouteWidth : s.widthSettings.routeWidth; // push layer matrix @@ -776,8 +776,8 @@ GNERoute::drawRoutePartialLane(const GUIVisualizationSettings& s, const GUIVisua const Position arrivalPos = segment->getNextLane()->getLaneShape().front(); // draw box line GLHelper::drawBoxLine(arrivalPos, - RAD2DEG(firstPosition.angleTo2D(arrivalPos)) - 90, - firstPosition.distanceTo2D(arrivalPos), .05); + RAD2DEG(firstPosition.angleTo2D(arrivalPos)) - 90, + firstPosition.distanceTo2D(arrivalPos), .05); // pop draw matrix GLHelper::popMatrix(); } @@ -788,7 +788,7 @@ GNERoute::drawRoutePartialLane(const GUIVisualizationSettings& s, const GUIVisua void GNERoute::drawRoutePartialJunction(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const double offsetFront, const GUIGeometry &geometry, const double exaggeration) const { + const double offsetFront, const GUIGeometry& geometry, const double exaggeration) const { const bool invalid = geometry.getShape().length() == 2; // get route width const double routeWidth = (myTagProperty.getTag() == GNE_TAG_ROUTE_EMBEDDED) ? s.widthSettings.embeddedRouteWidth : s.widthSettings.routeWidth; diff --git a/src/netedit/elements/demand/GNERoute.h b/src/netedit/elements/demand/GNERoute.h index 6ab09075644c..c4585cf32331 100644 --- a/src/netedit/elements/demand/GNERoute.h +++ b/src/netedit/elements/demand/GNERoute.h @@ -281,12 +281,12 @@ class GNERoute : public GNEDemandElement, public Parameterised { private: /// @brief draw route partial lane void drawRoutePartialLane(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const GNEPathManager::Segment* segment, const double offsetFront, - const GUIGeometry &geometry, const double exaggeration) const; + const GNEPathManager::Segment* segment, const double offsetFront, + const GUIGeometry& geometry, const double exaggeration) const; /// @brief draw route partial junction void drawRoutePartialJunction(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const double offsetFront, const GUIGeometry &geometry, const double exaggeration) const; + const double offsetFront, const GUIGeometry& geometry, const double exaggeration) const; /// @brief method for setting the attribute and nothing else void setAttribute(SumoXMLAttr key, const std::string& value); diff --git a/src/netedit/elements/demand/GNEStop.cpp b/src/netedit/elements/demand/GNEStop.cpp index b714286f5ccd..6a58055fec1d 100644 --- a/src/netedit/elements/demand/GNEStop.cpp +++ b/src/netedit/elements/demand/GNEStop.cpp @@ -1015,17 +1015,17 @@ GNEStop::drawIndex() const { void -GNEStop::drawStopOverLane(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, const RGBColor &color, - const double width, const double exaggeration) const { +GNEStop::drawStopOverLane(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, const RGBColor& color, + const double width, const double exaggeration) const { // Draw top and bot lines using shape, shapeRotations, shapeLengths and value of exaggeration GLHelper::drawBoxLines(myDemandElementGeometry.getShape(), - myDemandElementGeometry.getShapeRotations(), - myDemandElementGeometry.getShapeLengths(), - exaggeration * 0.1, 0, width); + myDemandElementGeometry.getShapeRotations(), + myDemandElementGeometry.getShapeLengths(), + exaggeration * 0.1, 0, width); GLHelper::drawBoxLines(myDemandElementGeometry.getShape(), - myDemandElementGeometry.getShapeRotations(), - myDemandElementGeometry.getShapeLengths(), - exaggeration * 0.1, 0, width * -1); + myDemandElementGeometry.getShapeRotations(), + myDemandElementGeometry.getShapeLengths(), + exaggeration * 0.1, 0, width * -1); // Add a detail matrix GLHelper::pushMatrix(); // move to geometry front @@ -1067,8 +1067,8 @@ GNEStop::drawStopOverLane(const GUIVisualizationSettings& s, const GUIVisualizat void -GNEStop::drawStopOverStoppingPlace(const GUIVisualizationSettings::Detail d, const RGBColor &color, - const double width, const double exaggeration) const { +GNEStop::drawStopOverStoppingPlace(const GUIVisualizationSettings::Detail d, const RGBColor& color, + const double width, const double exaggeration) const { // Draw the area using shape, shapeRotations, shapeLengths and value of exaggeration taked from stoppingPlace parent GUIGeometry::drawGeometry(d, myDemandElementGeometry, width); // only draw text if isn't being drawn for selecting diff --git a/src/netedit/elements/demand/GNEStop.h b/src/netedit/elements/demand/GNEStop.h index 66a5dd6ab50a..9338e424ad1b 100644 --- a/src/netedit/elements/demand/GNEStop.h +++ b/src/netedit/elements/demand/GNEStop.h @@ -230,10 +230,10 @@ class GNEStop : public GNEDemandElement, public SUMOVehicleParameter::Stop, publ /// @brief draw stop over lane void drawStopOverLane(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const RGBColor &color, const double width, const double exaggeration) const; + const RGBColor& color, const double width, const double exaggeration) const; /// @brief draw stop over stoppingPlace - void drawStopOverStoppingPlace(const GUIVisualizationSettings::Detail d, const RGBColor &color, + void drawStopOverStoppingPlace(const GUIVisualizationSettings::Detail d, const RGBColor& color, const double width, const double exaggeration) const; private: diff --git a/src/netedit/elements/demand/GNEStopPlan.cpp b/src/netedit/elements/demand/GNEStopPlan.cpp index a2c0ae101681..3973f6b62828 100644 --- a/src/netedit/elements/demand/GNEStopPlan.cpp +++ b/src/netedit/elements/demand/GNEStopPlan.cpp @@ -163,12 +163,12 @@ GNEStopPlan::updateGeometry() { const GNELane* backLane = getParentEdges().front()->getLanes().back(); // calculate front position const Position frontPosition = frontLane->getLaneShape().positionAtOffset2D(getAttributeDouble(GNE_ATTR_PLAN_GEOMETRY_ENDPOS), - frontLane->getDrawingConstants()->getDrawingWidth()); + frontLane->getDrawingConstants()->getDrawingWidth()); // calulate length between both shapes const double length = backLane->getLaneShape().distance2D(frontPosition, true); // calculate back position const Position backPosition = frontLane->getLaneShape().positionAtOffset2D(getAttributeDouble(GNE_ATTR_PLAN_GEOMETRY_ENDPOS), - (length + backLane->getDrawingConstants()->getDrawingWidth() - frontLane->getDrawingConstants()->getDrawingWidth()) * -1); + (length + backLane->getDrawingConstants()->getDrawingWidth() - frontLane->getDrawingConstants()->getDrawingWidth()) * -1); // update demand element geometry using both positions myDemandElementGeometry.updateGeometry({frontPosition, backPosition}); } diff --git a/src/netedit/elements/demand/GNEVehicle.cpp b/src/netedit/elements/demand/GNEVehicle.cpp index de3acd95ba5e..4fc5fa93c47d 100644 --- a/src/netedit/elements/demand/GNEVehicle.cpp +++ b/src/netedit/elements/demand/GNEVehicle.cpp @@ -437,7 +437,7 @@ GNEVehicle::GNESelectedVehiclesPopupMenu::onCmdTransform(FXObject* obj, FXSelect GNEVehicle::GNEVehicle(SumoXMLTag tag, GNENet* net) : GNEDemandElement("", net, GLO_VEHICLE, tag, GUIIconSubSys::getIcon(GUIIcon::VEHICLE), GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {}, {}, {}, {}, {}), - GNEDemandElementFlow(this) { +GNEDemandElementFlow(this) { // reset default values resetDefaultValues(); // set end and vehPerHours as default flow values @@ -450,7 +450,7 @@ GNEVehicle::GNEVehicle(SumoXMLTag tag, GNENet* net, const std::string& vehicleID GNEDemandElement(vehicleID, net, (tag == GNE_TAG_FLOW_ROUTE) ? GLO_ROUTEFLOW : GLO_VEHICLE, tag, (tag == GNE_TAG_FLOW_ROUTE) ? GUIIconSubSys::getIcon(GUIIcon::ROUTEFLOW) : GUIIconSubSys::getIcon(GUIIcon::VEHICLE), GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {}, {}, {}, {vehicleType, route}, {}), - GNEDemandElementFlow(this) { +GNEDemandElementFlow(this) { // SUMOVehicleParameter ID has to be set manually id = vehicleID; // set manually vtypeID (needed for saving) @@ -462,7 +462,7 @@ GNEVehicle::GNEVehicle(SumoXMLTag tag, GNENet* net, GNEDemandElement* vehicleTyp GNEDemandElement(vehicleParameters.id, net, (tag == GNE_TAG_FLOW_ROUTE) ? GLO_ROUTEFLOW : GLO_VEHICLE, tag, (tag == GNE_TAG_FLOW_ROUTE) ? GUIIconSubSys::getIcon(GUIIcon::ROUTEFLOW) : GUIIconSubSys::getIcon(GUIIcon::VEHICLE), GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {}, {}, {}, {vehicleType, route}, {}), - GNEDemandElementFlow(this, vehicleParameters) { +GNEDemandElementFlow(this, vehicleParameters) { // SUMOVehicleParameter ID has to be set manually id = vehicleParameters.id; // set manually vtypeID (needed for saving) @@ -474,7 +474,7 @@ GNEVehicle::GNEVehicle(SumoXMLTag tag, GNENet* net, GNEDemandElement* vehicleTyp GNEDemandElement(vehicleParameters.id, net, (tag == GNE_TAG_VEHICLE_WITHROUTE) ? GLO_VEHICLE : GLO_ROUTEFLOW, tag, (tag == GNE_TAG_FLOW_ROUTE) ? GUIIconSubSys::getIcon(GUIIcon::ROUTEFLOW) : GUIIconSubSys::getIcon(GUIIcon::VEHICLE), GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {}, {}, {}, {vehicleType}, {}), - GNEDemandElementFlow(this, vehicleParameters) { +GNEDemandElementFlow(this, vehicleParameters) { // SUMOVehicleParameter ID has to be set manually id = vehicleParameters.id; // reset routeid @@ -489,7 +489,7 @@ GNEVehicle::GNEVehicle(SumoXMLTag tag, GNENet* net, const std::string& vehicleID GNEDemandElement(vehicleID, net, (tag == SUMO_TAG_FLOW) ? GLO_FLOW : GLO_TRIP, tag, (tag == SUMO_TAG_FLOW) ? GUIIconSubSys::getIcon(GUIIcon::FLOW) : GUIIconSubSys::getIcon(GUIIcon::TRIP), GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {fromEdge, toEdge}, {}, {}, {vehicleType}, {}), - GNEDemandElementFlow(this) { +GNEDemandElementFlow(this) { } @@ -498,31 +498,35 @@ GNEVehicle::GNEVehicle(SumoXMLTag tag, GNENet* net, GNEDemandElement* vehicleTyp GNEDemandElement(vehicleParameters.id, net, (tag == SUMO_TAG_FLOW) ? GLO_FLOW : GLO_TRIP, tag, (tag == SUMO_TAG_FLOW) ? GUIIconSubSys::getIcon(GUIIcon::FLOW) : GUIIconSubSys::getIcon(GUIIcon::TRIP), GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {fromEdge, toEdge}, {}, {}, {vehicleType}, {}), - GNEDemandElementFlow(this, vehicleParameters) { +GNEDemandElementFlow(this, vehicleParameters) { } GNEVehicle::GNEVehicle(SumoXMLTag tag, GNENet* net, const std::string& vehicleID, GNEDemandElement* vehicleType, GNEJunction* fromJunction, GNEJunction* toJunction) : GNEDemandElement(vehicleID, net, (tag == GNE_TAG_FLOW_JUNCTIONS) ? GLO_FLOW : GLO_TRIP, tag, (tag == GNE_TAG_FLOW_JUNCTIONS) ? GUIIconSubSys::getIcon(GUIIcon::FLOW_JUNCTIONS) : GUIIconSubSys::getIcon(GUIIcon::TRIP_JUNCTIONS), - GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {fromJunction, toJunction}, {}, {}, {}, {vehicleType}, {}), - GNEDemandElementFlow(this) { + GNEPathManager::PathElement::Options::DEMAND_ELEMENT, { + fromJunction, toJunction +}, {}, {}, {}, {vehicleType}, {}), +GNEDemandElementFlow(this) { } GNEVehicle::GNEVehicle(SumoXMLTag tag, GNENet* net, GNEDemandElement* vehicleType, GNEJunction* fromJunction, GNEJunction* toJunction, const SUMOVehicleParameter& vehicleParameters) : GNEDemandElement(vehicleParameters.id, net, (tag == GNE_TAG_FLOW_JUNCTIONS) ? GLO_FLOW : GLO_TRIP, tag, (tag == GNE_TAG_FLOW_JUNCTIONS) ? GUIIconSubSys::getIcon(GUIIcon::FLOW_JUNCTIONS) : GUIIconSubSys::getIcon(GUIIcon::TRIP_JUNCTIONS), - GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {fromJunction, toJunction}, {}, {}, {}, {vehicleType}, {}), - GNEDemandElementFlow(this, vehicleParameters) { + GNEPathManager::PathElement::Options::DEMAND_ELEMENT, { + fromJunction, toJunction +}, {}, {}, {}, {vehicleType}, {}), +GNEDemandElementFlow(this, vehicleParameters) { } GNEVehicle::GNEVehicle(SumoXMLTag tag, GNENet* net, GNEDemandElement* vehicleType, GNEAdditional* fromTAZ, GNEAdditional* toTAZ, const SUMOVehicleParameter& vehicleParameters) : GNEDemandElement(vehicleParameters.id, net, (tag == GNE_TAG_FLOW_TAZS) ? GLO_FLOW : GLO_TRIP, tag, (tag == GNE_TAG_FLOW_TAZS) ? GUIIconSubSys::getIcon(GUIIcon::FLOW_TAZS) : GUIIconSubSys::getIcon(GUIIcon::TRIP_TAZS), - GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {}, {}, {fromTAZ, toTAZ}, {vehicleType}, {}), - GNEDemandElementFlow(this, vehicleParameters) { + GNEPathManager::PathElement::Options::DEMAND_ELEMENT, {}, {}, {}, {fromTAZ, toTAZ}, {vehicleType}, {}), +GNEDemandElementFlow(this, vehicleParameters) { // mark taz parameters as set parametersSet |= VEHPARS_FROM_TAZ_SET; parametersSet |= VEHPARS_TO_TAZ_SET; @@ -1178,13 +1182,13 @@ GNEVehicle::drawJunctionPartialGL(const GUIVisualizationSettings& s, const GNEPa if (segment->getPreviousLane() && segment->getNextLane()) { // calculate contour and draw dotted geometry segment->getContour()->calculateContourExtrudedShape(s, d, this, segment->getPreviousLane()->getLane2laneConnections().getLane2laneGeometry(segment->getNextLane()).getShape(), 0, - width, 1, false, false); + width, 1, false, false); } else if (segment->getPreviousLane() && myTagProperty.vehicleJunctions()) { segment->getContour()->calculateContourExtrudedShape(s, d, this, {segment->getPreviousLane()->getLaneShape().back(), getParentJunctions().back()->getPositionInView()}, 0, - width, 1, true, true); + width, 1, true, true); } else if (segment->getNextLane() && myTagProperty.vehicleJunctions()) { segment->getContour()->calculateContourExtrudedShape(s, d, this, {getParentJunctions().front()->getPositionInView(), segment->getNextLane()->getLaneShape().front()}, 0, - width, 1, true, true); + width, 1, true, true); } } } diff --git a/src/netedit/elements/network/GNEConnection.cpp b/src/netedit/elements/network/GNEConnection.cpp index a5a155296339..483d05e24e1c 100644 --- a/src/netedit/elements/network/GNEConnection.cpp +++ b/src/netedit/elements/network/GNEConnection.cpp @@ -205,7 +205,7 @@ GNEConnection::checkDrawMoveContour() const { const auto& editModes = myNet->getViewNet()->getEditModes(); // check if we're in move mode if (!myNet->getViewNet()->isMovingElement() && editModes.isCurrentSupermodeNetwork() && - (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { + (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { // only move the first element return myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this; } else { @@ -682,8 +682,8 @@ GNEConnection::getConnectionColor(const GUIVisualizationSettings& s) const { void -GNEConnection::drawConnection(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const PositionVector &shape, const double exaggeration) const { +GNEConnection::drawConnection(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, + const PositionVector& shape, const double exaggeration) const { // get color RGBColor connectionColor = getConnectionColor(s); // Push layer matrix @@ -725,7 +725,7 @@ GNEConnection::drawConnection(const GUIVisualizationSettings& s, const GUIVisual void -GNEConnection::drawConnectionArrows(const GUIVisualizationSettings& s, const RGBColor &color) const { +GNEConnection::drawConnectionArrows(const GUIVisualizationSettings& s, const RGBColor& color) const { if (s.showLaneDirection) { // Push matrix GLHelper::pushMatrix(); @@ -746,7 +746,7 @@ GNEConnection::drawConnectionArrows(const GUIVisualizationSettings& s, const RGB void -GNEConnection::drawEdgeValues(const GUIVisualizationSettings& s, const PositionVector &shape) const { +GNEConnection::drawEdgeValues(const GUIVisualizationSettings& s, const PositionVector& shape) const { // check if edge value has to be shown if (s.edgeValue.show(this)) { const NBEdge::Connection& nbCon = getNBEdgeConnection(); @@ -761,8 +761,8 @@ GNEConnection::drawEdgeValues(const GUIVisualizationSettings& s, const PositionV void -GNEConnection::calculateConnectionContour(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const PositionVector &shape, const double exaggeration) const { +GNEConnection::calculateConnectionContour(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, + const PositionVector& shape, const double exaggeration) const { // first check if junction parent was inserted with full boundary if (!gViewObjectsHandler.checkBoundaryParentElement(this, myFromLane->getParentEdge()->getToJunction())) { // calculate connection shape contour @@ -770,7 +770,7 @@ GNEConnection::calculateConnectionContour(const GUIVisualizationSettings& s, con // calculate geometry points contour if we're editing shape if (myShapeEdited) { myNetworkElementContour.calculateContourAllGeometryPoints(s, d, this, shape, s.neteditSizeSettings.connectionGeometryPointRadius, - exaggeration, true); + exaggeration, true); } } } diff --git a/src/netedit/elements/network/GNEConnection.h b/src/netedit/elements/network/GNEConnection.h index 2683dbb37db0..a303c47a0449 100644 --- a/src/netedit/elements/network/GNEConnection.h +++ b/src/netedit/elements/network/GNEConnection.h @@ -249,23 +249,23 @@ class GNEConnection : public GNENetworkElement { /// @brief check if draw connection bool checkDrawConnection() const; - + /// @brief get connection color RGBColor getConnectionColor(const GUIVisualizationSettings& s) const; /// @brief draw connection void drawConnection(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const PositionVector &shape, const double exaggeration) const; + const PositionVector& shape, const double exaggeration) const; /// @brief draw arrows over connections - void drawConnectionArrows(const GUIVisualizationSettings& s, const RGBColor &color) const; + void drawConnectionArrows(const GUIVisualizationSettings& s, const RGBColor& color) const; /// @brief draw edge value - void drawEdgeValues(const GUIVisualizationSettings& s, const PositionVector &shape) const; + void drawEdgeValues(const GUIVisualizationSettings& s, const PositionVector& shape) const; /// @brief calculate connection contour void calculateConnectionContour(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const PositionVector &shape, const double exaggeration) const; + const PositionVector& shape, const double exaggeration) const; /// @brief Invalidated copy constructor. GNEConnection(const GNEConnection&) = delete; diff --git a/src/netedit/elements/network/GNECrossing.cpp b/src/netedit/elements/network/GNECrossing.cpp index 178bb37ae99d..bc62e674d6a6 100644 --- a/src/netedit/elements/network/GNECrossing.cpp +++ b/src/netedit/elements/network/GNECrossing.cpp @@ -40,7 +40,7 @@ GNECrossing::GNECrossing(GNENet* net) : GNENetworkElement(net, "", GLO_CROSSING, SUMO_TAG_CROSSING, GUIIconSubSys::getIcon(GUIIcon::CROSSING), {}, {}, {}, {}, {}, {}), myParentJunction(nullptr), - myTemplateNBCrossing(new NBNode::Crossing(nullptr, {}, 0, false, 0, 0, {})) { +myTemplateNBCrossing(new NBNode::Crossing(nullptr, {}, 0, false, 0, 0, {})) { // reset default values resetDefaultValues(); } @@ -48,9 +48,9 @@ GNECrossing::GNECrossing(GNENet* net) : GNECrossing::GNECrossing(GNEJunction* parentJunction, std::vector crossingEdges) : GNENetworkElement(parentJunction->getNet(), parentJunction->getNBNode()->getCrossing(crossingEdges)->id, GLO_CROSSING, SUMO_TAG_CROSSING, GUIIconSubSys::getIcon(GUIIcon::CROSSING), {}, {}, {}, {}, {}, {}), - myParentJunction(parentJunction), - myCrossingEdges(crossingEdges), - myTemplateNBCrossing(nullptr) { +myParentJunction(parentJunction), +myCrossingEdges(crossingEdges), +myTemplateNBCrossing(nullptr) { // update centering boundary without updating grid updateCenteringBoundary(false); } @@ -153,7 +153,7 @@ GNECrossing::checkDrawMoveContour() const { const auto& editModes = myNet->getViewNet()->getEditModes(); // check if we're in move mode if (!myNet->getViewNet()->isMovingElement() && editModes.isCurrentSupermodeNetwork() && - (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { + (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { // only move the first element return myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this; } else { @@ -522,7 +522,7 @@ GNECrossing::drawCrossing(const GUIVisualizationSettings& s, const GUIVisualizat } // draw shape points only in Network supemode if (myShapeEdited && myNet->getViewNet()->getEditModes().isCurrentSupermodeNetwork() && - s.drawMovingGeometryPoint(exaggeration, s.neteditSizeSettings.crossingGeometryPointRadius)) { + s.drawMovingGeometryPoint(exaggeration, s.neteditSizeSettings.crossingGeometryPointRadius)) { // color const RGBColor darkerColor = crossingColor.changedBrightness(-32); // draw geometry points @@ -540,20 +540,15 @@ RGBColor GNECrossing::getCrossingColor(const GUIVisualizationSettings& s, const NBNode::Crossing* crossing) const { if (myShapeEdited) { return s.colorSettings.editShapeColor; - } - else if (drawUsingSelectColor()) { + } else if (drawUsingSelectColor()) { return s.colorSettings.selectedCrossingColor; - } - else if (!crossing->valid) { + } else if (!crossing->valid) { return s.colorSettings.crossingInvalidColor; - } - else if (crossing->priority) { + } else if (crossing->priority) { return s.colorSettings.crossingPriorityColor; - } - else if (myNet->getViewNet()->getEditModes().isCurrentSupermodeData()) { + } else if (myNet->getViewNet()->getEditModes().isCurrentSupermodeData()) { return s.laneColorer.getSchemes()[0].getColor(8); - } - else { + } else { return s.colorSettings.crossingColor; } } @@ -600,9 +595,9 @@ GNECrossing::calculateCrossingContour(const GUIVisualizationSettings& s, const G myNetworkElementContour.calculateContourExtrudedShape(s, d, this, myCrossingGeometry.getShape(), width, exaggeration, true, true, 0); // check if calculate contour for geometry points if (myShapeEdited) { - myNetworkElementContour.calculateContourAllGeometryPoints(s, d, this, myCrossingGeometry.getShape(), - s.neteditSizeSettings.crossingGeometryPointRadius, - exaggeration, true); + myNetworkElementContour.calculateContourAllGeometryPoints(s, d, this, myCrossingGeometry.getShape(), + s.neteditSizeSettings.crossingGeometryPointRadius, + exaggeration, true); } } } diff --git a/src/netedit/elements/network/GNEEdge.cpp b/src/netedit/elements/network/GNEEdge.cpp index 4847e5bd0ab1..8a84b2126f1b 100644 --- a/src/netedit/elements/network/GNEEdge.cpp +++ b/src/netedit/elements/network/GNEEdge.cpp @@ -67,16 +67,17 @@ const double GNEEdge::SNAP_RADIUS_SQUARED = (SUMO_const_halfLaneWidth* SUMO_cons // =========================================================================== GNEEdge::GNEEdge(GNENet* net, NBEdge* nbe, bool wasSplit, bool loaded): - GNENetworkElement(net, nbe->getID(), GLO_EDGE, SUMO_TAG_EDGE, GUIIconSubSys::getIcon(GUIIcon::EDGE), - {net->getAttributeCarriers()->retrieveJunction(nbe->getFromNode()->getID()), - net->getAttributeCarriers()->retrieveJunction(nbe->getToNode()->getID())}, - {}, {}, {}, {}, {}), - myNBEdge(nbe), - myLanes(0), - myAmResponsible(false), - myWasSplit(wasSplit), - myConnectionStatus(loaded ? FEATURE_LOADED : FEATURE_GUESSED), - myUpdateGeometry(true) { + GNENetworkElement(net, nbe->getID(), GLO_EDGE, SUMO_TAG_EDGE, GUIIconSubSys::getIcon(GUIIcon::EDGE), { + net->getAttributeCarriers()->retrieveJunction(nbe->getFromNode()->getID()), + net->getAttributeCarriers()->retrieveJunction(nbe->getToNode()->getID()) +}, +{}, {}, {}, {}, {}), +myNBEdge(nbe), +myLanes(0), +myAmResponsible(false), +myWasSplit(wasSplit), +myConnectionStatus(loaded ? FEATURE_LOADED : FEATURE_GUESSED), +myUpdateGeometry(true) { // Create lanes int numLanes = myNBEdge->getNumLanes(); myLanes.reserve(numLanes); @@ -301,15 +302,15 @@ GNEEdge::checkDrawDeleteContour() const { // check if we're in delete mode if (editModes.isCurrentSupermodeNetwork() && (editModes.networkEditMode == NetworkEditMode::NETWORK_DELETE)) { // check lanes - for (const auto &lane : myLanes) { + for (const auto& lane : myLanes) { if (myNet->getViewNet()->checkOverLockedElement(lane, mySelected) && - (myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == lane)) { + (myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == lane)) { return true; } } // check edge if (myNet->getViewNet()->checkOverLockedElement(this, mySelected) && - (myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this)) { + (myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this)) { return true; } // nothing to draw @@ -332,15 +333,15 @@ GNEEdge::checkDrawSelectContour() const { // check if we're in select mode if (editModes.isCurrentSupermodeNetwork() && (editModes.networkEditMode == NetworkEditMode::NETWORK_SELECT)) { // check lanes - for (const auto &lane : myLanes) { + for (const auto& lane : myLanes) { if (myNet->getViewNet()->checkOverLockedElement(lane, mySelected) && - (myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == lane)) { + (myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == lane)) { return true; } } // check edge if (myNet->getViewNet()->checkOverLockedElement(this, mySelected) && - (myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this)) { + (myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this)) { return true; } // nothing to draw @@ -360,17 +361,17 @@ GNEEdge::checkDrawMoveContour() const { const auto& editModes = myNet->getViewNet()->getEditModes(); // check if we're in move mode if (!myNet->getViewNet()->isMovingElement() && editModes.isCurrentSupermodeNetwork() && - (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE)) { + (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE)) { // check lanes - for (const auto &lane : myLanes) { + for (const auto& lane : myLanes) { if (myNet->getViewNet()->checkOverLockedElement(lane, mySelected) && - (myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == lane)) { + (myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == lane)) { return true; } } // check edge if (myNet->getViewNet()->checkOverLockedElement(this, mySelected) && - (myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this)) { + (myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this)) { return true; } // nothing to draw @@ -2530,7 +2531,7 @@ GNEEdge::drawEdgeGeometryPoints(const GUIVisualizationSettings& s, const GUIVisu // push geometry point drawing matrix GLHelper::pushMatrix(); // translate to front depending of big points - glTranslated(0, 0, bigGeometryPoints? GLO_GEOMETRYPOINT : GLO_LANE + 1); + glTranslated(0, 0, bigGeometryPoints ? GLO_GEOMETRYPOINT : GLO_LANE + 1); // set color GLHelper::setColor(geometryPointColor); // move to geometryPointPos @@ -2554,14 +2555,14 @@ GNEEdge::drawEdgeGeometryPoints(const GUIVisualizationSettings& s, const GUIVisu } // draw dotted contour geometry points myNetworkElementContour.drawDottedContourGeometryPoints(s, d, this, myNBEdge->getGeometry(), geometryPointRadius, - exaggeration, s.dottedContourSettings.segmentWidthSmall); + exaggeration, s.dottedContourSettings.segmentWidthSmall); } } void GNEEdge::drawStartGeometryPoint(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const double geometryPointRadius, const double exaggeration) const { + const double geometryPointRadius, const double exaggeration) const { // check detail level if (d <= GUIVisualizationSettings::Detail::GeometryPoint) { // get first geometry point @@ -2617,7 +2618,7 @@ GNEEdge::drawStartGeometryPoint(const GUIVisualizationSettings& s, const GUIVisu } // draw dotted contour geometry points myNetworkElementContour.calculateContourFirstGeometryPoint(s, d, this, myNBEdge->getInnerGeometry(), - geometryPointRadius, exaggeration); + geometryPointRadius, exaggeration); } } } @@ -2625,7 +2626,7 @@ GNEEdge::drawStartGeometryPoint(const GUIVisualizationSettings& s, const GUIVisu void GNEEdge::drawEndGeometryPoint(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, - const double geometryPointRadius, const double exaggeration) const { + const double geometryPointRadius, const double exaggeration) const { // check detail level if (d <= GUIVisualizationSettings::Detail::GeometryPoint) { // get first geometry point @@ -2681,7 +2682,7 @@ GNEEdge::drawEndGeometryPoint(const GUIVisualizationSettings& s, const GUIVisual } // draw dotted contour geometry points myNetworkElementContour.calculateContourFirstGeometryPoint(s, d, this, myNBEdge->getInnerGeometry(), - geometryPointRadius, exaggeration); + geometryPointRadius, exaggeration); } } } @@ -2836,7 +2837,7 @@ GNEEdge::drawTAZElements(const GUIVisualizationSettings& s) const { // get all TAZ source/sinks vinculated with this edge for (const auto& additional : getChildAdditionals()) { if ((additional->getTagProperty().getTag() == SUMO_TAG_TAZSOURCE) || - (additional->getTagProperty().getTag() == SUMO_TAG_TAZSINK)) { + (additional->getTagProperty().getTag() == SUMO_TAG_TAZSINK)) { TAZSourceSinks.push_back(additional); } } @@ -2893,7 +2894,7 @@ void GNEEdge::drawEdgeShape(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d) const { // avoid draw for railways if ((d <= GUIVisualizationSettings::Detail::LaneDetails) && !myLanes.front()->getDrawingConstants()->drawAsRailway() && - (gViewObjectsHandler.markedFirstGeometryPoint == this)) { + (gViewObjectsHandler.markedFirstGeometryPoint == this)) { // push draw matrix GLHelper::pushMatrix(); // translate to front depending of big points @@ -2927,7 +2928,7 @@ GNEEdge::drawEdgeShape(const GUIVisualizationSettings& s, const GUIVisualization bool GNEEdge::drawBigGeometryPoints() const { // get edit modes - const auto &editModes = myNet->getViewNet()->getEditModes(); + const auto& editModes = myNet->getViewNet()->getEditModes(); // continue depending of conditions if (!editModes.isCurrentSupermodeNetwork()) { return false; diff --git a/src/netedit/elements/network/GNEEdge.h b/src/netedit/elements/network/GNEEdge.h index 7039db92727e..ed71db0002ae 100644 --- a/src/netedit/elements/network/GNEEdge.h +++ b/src/netedit/elements/network/GNEEdge.h @@ -490,10 +490,10 @@ class GNEEdge : public GNENetworkElement, public GNECandidateElement { /// @brief draw children void drawChildrens(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d) const; - + /// @brief calculate contours void calculateEdgeContour(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d) const; - + /// @brief draw TAZElements void drawTAZElements(const GUIVisualizationSettings& s) const; diff --git a/src/netedit/elements/network/GNEEdgeTemplate.h b/src/netedit/elements/network/GNEEdgeTemplate.h index 6d3a213df6a6..5c3222191610 100644 --- a/src/netedit/elements/network/GNEEdgeTemplate.h +++ b/src/netedit/elements/network/GNEEdgeTemplate.h @@ -83,7 +83,7 @@ class GNEEdgeTemplate : public GNEAttributeCarrier { /// @brief check if draw select contour (blue) bool checkDrawSelectContour() const; - + /// @brief check if draw move contour (red) bool checkDrawMoveContour() const; diff --git a/src/netedit/elements/network/GNEInternalLane.cpp b/src/netedit/elements/network/GNEInternalLane.cpp index e870e785efc9..f7add9134821 100644 --- a/src/netedit/elements/network/GNEInternalLane.cpp +++ b/src/netedit/elements/network/GNEInternalLane.cpp @@ -61,13 +61,13 @@ const StringBijection GNEInternalLane::LinkStateNames( GNEInternalLane::GNEInternalLane(GNETLSEditorFrame* editor, GNEJunction* junctionParent, const std::string& id, const PositionVector& shape, int tlIndex, LinkState state) : GNENetworkElement(junctionParent->getNet(), id, GLO_TLLOGIC, GNE_TAG_INTERNAL_LANE, - GUIIconSubSys::getIcon(GUIIcon::LANE), {}, {}, {}, {}, {}, {}), - myJunctionParent(junctionParent), - myState(state), - myStateTarget(myState), - myEditor(editor), - myTlIndex(tlIndex), - myPopup(nullptr) { + GUIIconSubSys::getIcon(GUIIcon::LANE), {}, {}, {}, {}, {}, {}), + myJunctionParent(junctionParent), + myState(state), + myStateTarget(myState), + myEditor(editor), + myTlIndex(tlIndex), +myPopup(nullptr) { // calculate internal lane geometry myInternalLaneGeometry.updateGeometry(shape); // update centering boundary without updating grid @@ -80,11 +80,11 @@ GNEInternalLane::GNEInternalLane(GNETLSEditorFrame* editor, GNEJunction* junctio GNEInternalLane::GNEInternalLane() : GNENetworkElement(nullptr, "dummyInternalLane", GLO_TLLOGIC, GNE_TAG_INTERNAL_LANE, GUIIconSubSys::getIcon(GUIIcon::LANE), {}, {}, {}, {}, {}, {}), - myJunctionParent(nullptr), - myState(0), - myEditor(0), - myTlIndex(0), - myPopup(nullptr) { +myJunctionParent(nullptr), +myState(0), +myEditor(0), +myTlIndex(0), +myPopup(nullptr) { } @@ -214,7 +214,7 @@ GNEInternalLane::drawGL(const GUIVisualizationSettings& s) const { } // calculate contour myNetworkElementContour.calculateContourExtrudedShape(s, d, this, myInternalLaneGeometry.getShape(), - s.connectionSettings.connectionWidth, 1, true, true, 0); + s.connectionSettings.connectionWidth, 1, true, true, 0); } } diff --git a/src/netedit/elements/network/GNEJunction.cpp b/src/netedit/elements/network/GNEJunction.cpp index 399ea64ccdc0..7d978c1dd7be 100644 --- a/src/netedit/elements/network/GNEJunction.cpp +++ b/src/netedit/elements/network/GNEJunction.cpp @@ -62,11 +62,11 @@ GNEJunction::GNEJunction(GNENet* net, NBNode* nbn, bool loaded) : GNENetworkElement(net, nbn->getID(), GLO_JUNCTION, SUMO_TAG_JUNCTION, GUIIconSubSys::getIcon(GUIIcon::JUNCTION), {}, {}, {}, {}, {}, {}), - myNBNode(nbn), - myDrawingToggle(new int), - myLogicStatus(loaded ? FEATURE_LOADED : FEATURE_GUESSED), - myHasValidLogic(loaded), - myTesselation(nbn->getID(), "", RGBColor::MAGENTA, nbn->getShape(), false, true, 0) { + myNBNode(nbn), + myDrawingToggle(new int), + myLogicStatus(loaded ? FEATURE_LOADED : FEATURE_GUESSED), + myHasValidLogic(loaded), +myTesselation(nbn->getID(), "", RGBColor::MAGENTA, nbn->getShape(), false, true, 0) { // update centering boundary without updating grid updateCenteringBoundary(false); } @@ -328,7 +328,7 @@ GNEJunction::checkDrawMoveContour() const { const auto& editModes = myNet->getViewNet()->getEditModes(); // check if we're in move mode if (!myNet->getViewNet()->isMovingElement() && editModes.isCurrentSupermodeNetwork() && - (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { + (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && myNet->getViewNet()->checkOverLockedElement(this, mySelected)) { // only move the first element return myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this; } else { @@ -585,21 +585,21 @@ GNEJunction::updateCenteringBoundary(const bool updateGrid) { myJunctionBoundary.grow(5); } // add boundaries of all connections, walking areas and crossings - for (const auto &edge : myGNEIncomingEdges) { - for (const auto &connection : edge->getGNEConnections()) { + for (const auto& edge : myGNEIncomingEdges) { + for (const auto& connection : edge->getGNEConnections()) { const auto boundary = connection->getCenteringBoundary(); if (boundary.isInitialised()) { myJunctionBoundary.add(boundary); } } } - for (const auto &crossing : myGNECrossings) { + for (const auto& crossing : myGNECrossings) { const auto boundary = crossing->getCenteringBoundary(); if (boundary.isInitialised()) { myJunctionBoundary.add(boundary); } } - for (const auto &walkingArea : myGNEWalkingAreas) { + for (const auto& walkingArea : myGNEWalkingAreas) { const auto boundary = walkingArea->getCenteringBoundary(); if (boundary.isInitialised()) { myJunctionBoundary.add(boundary); @@ -1652,7 +1652,7 @@ GNEJunction::drawJunctionAsShape(const GUIVisualizationSettings& s, const GUIVis } // draw shape points only in Network supermode if (myShapeEdited && myNet->getViewNet()->getEditModes().isCurrentSupermodeNetwork() && - s.drawMovingGeometryPoint(exaggeration, s.neteditSizeSettings.junctionGeometryPointRadius)) { + s.drawMovingGeometryPoint(exaggeration, s.neteditSizeSettings.junctionGeometryPointRadius)) { // get mouse position const auto mousePos = myNet->getViewNet()->getPositionInformation(); // set color @@ -1684,8 +1684,8 @@ void GNEJunction::drawTLSIcon(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d) const { // draw TLS icon if isn't being drawn for selecting if ((d <= GUIVisualizationSettings::Detail::TLSIcon) && myNBNode->isTLControlled() && - (myNet->getViewNet()->getEditModes().networkEditMode == NetworkEditMode::NETWORK_TLS) && - !myAmTLSSelected && !s.drawForRectangleSelection) { + (myNet->getViewNet()->getEditModes().networkEditMode == NetworkEditMode::NETWORK_TLS) && + !myAmTLSSelected && !s.drawForRectangleSelection) { GLHelper::pushMatrix(); const Position pos = myNBNode->getPosition(); glTranslated(pos.x(), pos.y(), 2.2); @@ -1777,7 +1777,7 @@ GNEJunction::calculateJunctioncontour(const GUIVisualizationSettings& s, const G // check geometry points if we're editing shape if (myShapeEdited) { myNetworkElementContour.calculateContourAllGeometryPoints(s, d, this, myNBNode->getShape(), s.neteditSizeSettings.connectionGeometryPointRadius, - exaggeration, true); + exaggeration, true); } } } diff --git a/src/netedit/elements/network/GNEJunction.h b/src/netedit/elements/network/GNEJunction.h index 7988b3f4d51b..c3c42297270b 100644 --- a/src/netedit/elements/network/GNEJunction.h +++ b/src/netedit/elements/network/GNEJunction.h @@ -309,7 +309,7 @@ class GNEJunction : public GNENetworkElement, public GNECandidateElement { bool myJunctionInGrid = true; /// @brief drawing toggle (used to avoid double draws) - int *myDrawingToggle; + int* myDrawingToggle; /// @brief variable used for draw circle contours GNEContour myCircleContour; diff --git a/src/netedit/elements/network/GNELane.cpp b/src/netedit/elements/network/GNELane.cpp index f5d87e282e15..ff6d154045bc 100644 --- a/src/netedit/elements/network/GNELane.cpp +++ b/src/netedit/elements/network/GNELane.cpp @@ -73,11 +73,11 @@ GNELane::DrawingConstants::DrawingConstants(const GNELane* lane) : void GNELane::DrawingConstants::update(const GUIVisualizationSettings& s) { // get lane struct - const auto &laneStruct = myLane->myParentEdge->getNBEdge()->getLaneStruct(myLane->getIndex()); + const auto& laneStruct = myLane->myParentEdge->getNBEdge()->getLaneStruct(myLane->getIndex()); // get selection scale const double selectionScale = myLane->isAttributeCarrierSelected() || myLane->myParentEdge->isAttributeCarrierSelected() ? s.selectorFrameScale : 1; // get lane width - const double laneWidth = (laneStruct.width == -1? SUMO_const_laneWidth : laneStruct.width); + const double laneWidth = (laneStruct.width == -1 ? SUMO_const_laneWidth : laneStruct.width); // calculate exaggeration myExaggeration = selectionScale * s.laneWidthExaggeration; // get detail level @@ -157,12 +157,12 @@ GNELane::DrawingConstants::drawSuperposed() const { GNELane::GNELane(GNEEdge* edge, const int index) : GNENetworkElement(edge->getNet(), edge->getNBEdge()->getLaneID(index), GLO_LANE, SUMO_TAG_LANE, GUIIconSubSys::getIcon(GUIIcon::LANE), {}, {}, {}, {}, {}, {}), - myParentEdge(edge), - myIndex(index), - myDrawingConstants(new DrawingConstants(this)), - mySpecialColor(nullptr), - mySpecialColorValue(-1), - myLane2laneConnections(this){ + myParentEdge(edge), + myIndex(index), + myDrawingConstants(new DrawingConstants(this)), + mySpecialColor(nullptr), + mySpecialColorValue(-1), +myLane2laneConnections(this) { // update centering boundary without updating grid updateCenteringBoundary(false); } @@ -171,12 +171,12 @@ GNELane::GNELane(GNEEdge* edge, const int index) : GNELane::GNELane() : GNENetworkElement(nullptr, "dummyConstructorGNELane", GLO_LANE, SUMO_TAG_LANE, GUIIconSubSys::getIcon(GUIIcon::LANE), {}, {}, {}, {}, {}, {}), - myParentEdge(nullptr), - myIndex(-1), - myDrawingConstants(nullptr), - mySpecialColor(nullptr), - mySpecialColorValue(-1), - myLane2laneConnections(this) { +myParentEdge(nullptr), +myIndex(-1), +myDrawingConstants(nullptr), +mySpecialColor(nullptr), +mySpecialColorValue(-1), +myLane2laneConnections(this) { } @@ -1029,11 +1029,11 @@ GNELane::drawLane(const GUIVisualizationSettings& s) const { } else if (myShapeColors.size() > 0) { // draw geometry with own colors GUIGeometry::drawGeometry(myDrawingConstants->getDetail(), myLaneGeometry, myShapeColors, - myDrawingConstants->getDrawingWidth(), myDrawingConstants->getOffset()); + myDrawingConstants->getDrawingWidth(), myDrawingConstants->getOffset()); } else { // draw geometry with current color GUIGeometry::drawGeometry(myDrawingConstants->getDetail(), myLaneGeometry, myDrawingConstants->getDrawingWidth(), - myDrawingConstants->getOffset()); + myDrawingConstants->getOffset()); } // if lane is selected, draw a second lane over it drawSelectedLane(s); @@ -1192,7 +1192,7 @@ GNELane::drawLinkNo(const GUIVisualizationSettings& s) const { // check draw conditions if (s.drawLinkJunctionIndex.show(myParentEdge->getToJunction())) { // get connections - const auto &connections = myParentEdge->getNBEdge()->getConnectionsFromLane(myIndex); + const auto& connections = myParentEdge->getNBEdge()->getConnectionsFromLane(myIndex); // get number of links const int noLinks = (int)connections.size(); // only continue if there is links @@ -1211,7 +1211,7 @@ GNELane::drawLinkNo(const GUIVisualizationSettings& s) const { const double x2 = x1 - (double)(width / 2.); // get link index const int linkIndex = myParentEdge->getNBEdge()->getToNode()->getConnectionIndex(myParentEdge->getNBEdge(), - connections[s.lefthand ? noLinks - 1 - i : i]); + connections[s.lefthand ? noLinks - 1 - i : i]); // draw link index GLHelper::drawTextAtEnd(toString(linkIndex), myLaneGeometry.getShape(), x2, s.drawLinkJunctionIndex, s.scale); // update x1 @@ -1230,7 +1230,7 @@ GNELane::drawTLSLinkNo(const GUIVisualizationSettings& s) const { if ((myDrawingConstants->getDetail() <= GUIVisualizationSettings::Detail::LaneDetails) && s.drawLinkTLIndex.show(myParentEdge->getToJunction()) && (myParentEdge->getToJunction()->getNBNode()->getControllingTLS().size() > 0)) { // get connections - const auto &connections = myParentEdge->getNBEdge()->getConnectionsFromLane(myIndex); + const auto& connections = myParentEdge->getNBEdge()->getConnectionsFromLane(myIndex); // get numer of links const int noLinks = (int)connections.size(); // only continue if there are links @@ -1388,8 +1388,8 @@ GNELane::drawLane2LaneConnections() const { } const Position& endPos = it.toEdge->getLaneShape(it.toLane)[0]; glBegin(GL_LINES); - glVertex2d(startPos.x(), startPos.y()); - glVertex2d(endPos.x(), endPos.y()); + glVertex2d(startPos.x(), startPos.y()); + glVertex2d(endPos.x(), endPos.y()); glEnd(); GLHelper::drawTriangleAtEnd(startPos, endPos, (double) 1.5, (double) .2); } @@ -1403,11 +1403,11 @@ GNELane::calculateLaneContour(const GUIVisualizationSettings& s) const { if (!gViewObjectsHandler.checkBoundaryParentElement(this, myParentEdge)) { // calculate contour myNetworkElementContour.calculateContourExtrudedShape(s, myDrawingConstants->getDetail(), this, myLaneGeometry.getShape(), - myDrawingConstants->getDrawingWidth(), 1, true, true, myDrawingConstants->getOffset()); + myDrawingConstants->getDrawingWidth(), 1, true, true, myDrawingConstants->getOffset()); // calculate geometry points contour if we're editing shape if (myShapeEdited) { myNetworkElementContour.calculateContourAllGeometryPoints(s, myDrawingConstants->getDetail(), this, myLaneGeometry.getShape(), - s.neteditSizeSettings.laneGeometryPointRadius, myDrawingConstants->getExaggeration(), true); + s.neteditSizeSettings.laneGeometryPointRadius, myDrawingConstants->getExaggeration(), true); } } } @@ -1689,10 +1689,10 @@ GNELane::drawLaneStopOffset(const GUIVisualizationSettings& s) const { glRotated(rot, 0, 0, 1); glTranslated(0, laneStopOffset.getOffset(), 0); glBegin(GL_QUADS); - glVertex2d(-myDrawingConstants->getDrawingWidth(), 0.0); - glVertex2d(-myDrawingConstants->getDrawingWidth(), 0.2); - glVertex2d(myDrawingConstants->getDrawingWidth(), 0.2); - glVertex2d(myDrawingConstants->getDrawingWidth(), 0.0); + glVertex2d(-myDrawingConstants->getDrawingWidth(), 0.0); + glVertex2d(-myDrawingConstants->getDrawingWidth(), 0.2); + glVertex2d(myDrawingConstants->getDrawingWidth(), 0.2); + glVertex2d(myDrawingConstants->getDrawingWidth(), 0.0); glEnd(); GLHelper::popMatrix(); } @@ -1734,9 +1734,9 @@ GNELane::drawDirectionIndicators(const GUIVisualizationSettings& s) const { const double length = MIN2(width * 0.5, myLaneGeometry.getShapeLengths()[i] - subWidth); // draw triangle glBegin(GL_TRIANGLES); - glVertex2d(sideOffset, -subWidth - length); - glVertex2d(sideOffset - width * 0.25, -subWidth); - glVertex2d(sideOffset + width * 0.25, -subWidth); + glVertex2d(sideOffset, -subWidth - length); + glVertex2d(sideOffset - width * 0.25, -subWidth); + glVertex2d(sideOffset + width * 0.25, -subWidth); glEnd(); } // pop triangle matrix diff --git a/src/netedit/elements/network/GNELane.h b/src/netedit/elements/network/GNELane.h index 18b7605dc965..36f3e5547603 100644 --- a/src/netedit/elements/network/GNELane.h +++ b/src/netedit/elements/network/GNELane.h @@ -335,7 +335,7 @@ class GNELane : public GNENetworkElement, public GNECandidateElement, public FXD GUIGeometry myLaneGeometry; /// @brief LaneDrawingConstants - DrawingConstants *myDrawingConstants; + DrawingConstants* myDrawingConstants; /// @name computed only once (for performance) in updateGeometry() /// @{ diff --git a/src/netedit/elements/network/GNEWalkingArea.cpp b/src/netedit/elements/network/GNEWalkingArea.cpp index c0fd7035c783..d8b6c887abe8 100644 --- a/src/netedit/elements/network/GNEWalkingArea.cpp +++ b/src/netedit/elements/network/GNEWalkingArea.cpp @@ -40,8 +40,8 @@ GNEWalkingArea::GNEWalkingArea(GNEJunction* parentJunction, const std::string& ID) : GNENetworkElement(parentJunction->getNet(), ID, GLO_WALKINGAREA, SUMO_TAG_WALKINGAREA, GUIIconSubSys::getIcon(GUIIcon::WALKINGAREA), {}, {}, {}, {}, {}, {}), - myParentJunction(parentJunction), - myTesselation(ID, "", RGBColor::GREY, parentJunction->getNBNode()->getWalkingArea(ID).shape, false, true, 0) { + myParentJunction(parentJunction), +myTesselation(ID, "", RGBColor::GREY, parentJunction->getNBNode()->getWalkingArea(ID).shape, false, true, 0) { // update centering boundary without updating grid updateCenteringBoundary(false); } @@ -157,7 +157,7 @@ GNEWalkingArea::drawGL(const GUIVisualizationSettings& s) const { const auto& walkingAreaShape = myParentJunction->getNBNode()->getWalkingArea(getID()).shape; // only continue if exaggeration is greater than 0 and junction's shape is greater than 4 if ((myParentJunction->getNBNode()->getShape().area() > 4) && - (walkingAreaShape.size() > 0) && s.drawCrossingsAndWalkingareas) { + (walkingAreaShape.size() > 0) && s.drawCrossingsAndWalkingareas) { // get detail level const auto d = s.getDetailLevel(walkingAreaExaggeration); // draw geometry only if we'rent in drawForObjectUnderCursor mode @@ -350,7 +350,7 @@ GNEWalkingArea::drawWalkingArea(const GUIVisualizationSettings& s, const GUIVisu bool GNEWalkingArea::drawInContourMode() const { - const auto &modes = myNet->getViewNet()->getEditModes(); + const auto& modes = myNet->getViewNet()->getEditModes(); // check modes if (!modes.isCurrentSupermodeNetwork()) { return false; diff --git a/src/netedit/elements/network/GNEWalkingArea.h b/src/netedit/elements/network/GNEWalkingArea.h index 8fdfe9713fb7..02f0bc86da18 100644 --- a/src/netedit/elements/network/GNEWalkingArea.h +++ b/src/netedit/elements/network/GNEWalkingArea.h @@ -185,7 +185,7 @@ class GNEWalkingArea : public GNENetworkElement { /// @brief draw walking area void drawWalkingArea(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, const PositionVector& shape, const double exaggeration) const; - + /// @brief check if draw walking area in contour mode bool drawInContourMode() const; diff --git a/src/netedit/frames/GNEConsecutiveSelector.cpp b/src/netedit/frames/GNEConsecutiveSelector.cpp index 53c4e10a2bed..5a340759c15b 100644 --- a/src/netedit/frames/GNEConsecutiveSelector.cpp +++ b/src/netedit/frames/GNEConsecutiveSelector.cpp @@ -289,16 +289,16 @@ GNEConsecutiveSelector::drawTemporalConsecutiveLanePath() const { // Pop matrix GLHelper::popMatrix(); } - /* - // draw points - const RGBColor pointColor = RGBColor::RED; - // positions - const Position firstPosition = myLanePath.front().first->getLaneShape().positionAtOffset2D(myLanePath.front().second); - const Position secondPosition = myLanePath.back().first->getLaneShape().positionAtOffset2D(myLanePath.back().second); - // draw geometry points - GUIGeometry::drawGeometryPoints(s, nullptr, myFrameParent->getViewNet()->getPositionInformation(), {firstPosition, secondPosition}, - pointColor, RGBColor::WHITE, s.neteditSizeSettings.polylineWidth, 1, false, true); - */ + /* + // draw points + const RGBColor pointColor = RGBColor::RED; + // positions + const Position firstPosition = myLanePath.front().first->getLaneShape().positionAtOffset2D(myLanePath.front().second); + const Position secondPosition = myLanePath.back().first->getLaneShape().positionAtOffset2D(myLanePath.back().second); + // draw geometry points + GUIGeometry::drawGeometryPoints(s, nullptr, myFrameParent->getViewNet()->getPositionInformation(), {firstPosition, secondPosition}, + pointColor, RGBColor::WHITE, s.neteditSizeSettings.polylineWidth, 1, false, true); + */ // Pop last matrix GLHelper::popMatrix(); } diff --git a/src/netedit/frames/GNEDemandSelector.cpp b/src/netedit/frames/GNEDemandSelector.cpp index 9dbf03810d6a..e96682c671cf 100644 --- a/src/netedit/frames/GNEDemandSelector.cpp +++ b/src/netedit/frames/GNEDemandSelector.cpp @@ -207,7 +207,7 @@ GNEDemandElementSelector::refreshDemandElementSelector() { } for (const auto& demandElement : sortedElements) { myDemandElementsComboBox->appendIconItem(demandElement.first.c_str(), demandElement.second->getACIcon(), - demandElement.second->getTagProperty().getBackGroundColor()); + demandElement.second->getTagProperty().getBackGroundColor()); } } } diff --git a/src/netedit/frames/GNEFrameAttributeModules.cpp b/src/netedit/frames/GNEFrameAttributeModules.cpp index 2aa6a0088d0f..89bd8fc441f3 100644 --- a/src/netedit/frames/GNEFrameAttributeModules.cpp +++ b/src/netedit/frames/GNEFrameAttributeModules.cpp @@ -536,7 +536,7 @@ GNEFrameAttributeModules::AttributesEditorRow::buildAttributeElements(const bool myAttributeButton->setTipText(TL("Open dialog for editing vClasses")); myAttributeButton->setHelpText(TL("Open dialog for editing vClasses")); // check if disable - if (!attributeEnabled ||disableRow) { + if (!attributeEnabled || disableRow) { myAttributeButton->disable(); } } else if (myACAttr.isColor()) { diff --git a/src/netedit/frames/common/GNESelectorFrame.cpp b/src/netedit/frames/common/GNESelectorFrame.cpp index 04ff77c67f98..6645c74ba432 100644 --- a/src/netedit/frames/common/GNESelectorFrame.cpp +++ b/src/netedit/frames/common/GNESelectorFrame.cpp @@ -928,8 +928,8 @@ GNESelectorFrame::SelectionOperation::processDemandElementSelection(const bool o for (const auto& demandElementTag : demandElements) { for (const auto& demandElement : demandElementTag.second) { if (demandElement.second->getTagProperty().isVehicleStop() || - demandElement.second->getTagProperty().isVehicleWaypoint() || - demandElement.second->getTagProperty().isPlanStop()) { + demandElement.second->getTagProperty().isVehicleWaypoint() || + demandElement.second->getTagProperty().isPlanStop()) { if (onlyCount) { return true; } else if (onlyUnselect || demandElement.second->isAttributeCarrierSelected()) { diff --git a/src/netedit/frames/network/GNECreateEdgeFrame.cpp b/src/netedit/frames/network/GNECreateEdgeFrame.cpp index 0ee45d4ce0aa..7ef11d85cd59 100644 --- a/src/netedit/frames/network/GNECreateEdgeFrame.cpp +++ b/src/netedit/frames/network/GNECreateEdgeFrame.cpp @@ -77,34 +77,34 @@ GNECreateEdgeFrame::EdgeTypeSelector::EdgeTypeSelector(GNECreateEdgeFrame* creat myCurrentIndex(0) { // default edge radio button myCreateDefaultEdgeType = new FXRadioButton(getCollapsableFrame(), TL("Create default edge"), - this, MID_GNE_CREATEEDGEFRAME_SELECTRADIOBUTTON, GUIDesignRadioButton); + this, MID_GNE_CREATEEDGEFRAME_SELECTRADIOBUTTON, GUIDesignRadioButton); // default short radio button myCreateDefaultShortEdgeType = new FXRadioButton(getCollapsableFrame(), TL("Create default edge short"), - this, MID_GNE_CREATEEDGEFRAME_SELECTRADIOBUTTON, GUIDesignRadioButton); + this, MID_GNE_CREATEEDGEFRAME_SELECTRADIOBUTTON, GUIDesignRadioButton); // checkboxes myNoPedestriansCheckButton = new FXCheckButton(getCollapsableFrame(), TL("Disallow for pedestrians"), - this, MID_GNE_CREATEEDGEFRAME_CHECKBUTTON, GUIDesignCheckButton); + this, MID_GNE_CREATEEDGEFRAME_CHECKBUTTON, GUIDesignCheckButton); myAddSidewalkCheckButton = new FXCheckButton(getCollapsableFrame(), TL("Add sidewalk"), - this, MID_GNE_CREATEEDGEFRAME_CHECKBUTTON, GUIDesignCheckButton); + this, MID_GNE_CREATEEDGEFRAME_CHECKBUTTON, GUIDesignCheckButton); myAddBikelaneCheckButton = new FXCheckButton(getCollapsableFrame(), TL("Add bikelane"), - this, MID_GNE_CREATEEDGEFRAME_CHECKBUTTON, GUIDesignCheckButton); + this, MID_GNE_CREATEEDGEFRAME_CHECKBUTTON, GUIDesignCheckButton); // use custom edge radio button myCreateCustomEdgeType = new FXRadioButton(getCollapsableFrame(), TL("Use edgeType/template"), - this, MID_GNE_CREATEEDGEFRAME_SELECTRADIOBUTTON, GUIDesignRadioButton); + this, MID_GNE_CREATEEDGEFRAME_SELECTRADIOBUTTON, GUIDesignRadioButton); // edge types combo box myEdgeTypesComboBox = new MFXComboBoxIcon(getCollapsableFrame(), GUIDesignComboBoxNCol, true, GUIDesignComboBoxVisibleItemsMedium, - this, MID_GNE_CREATEEDGEFRAME_SELECTTEMPLATE, GUIDesignComboBoxAttribute); + this, MID_GNE_CREATEEDGEFRAME_SELECTTEMPLATE, GUIDesignComboBoxAttribute); // create horizontal frame FXHorizontalFrame* horizontalFrameButtons = new FXHorizontalFrame(getCollapsableFrame(), GUIDesignAuxiliarHorizontalFrame); // create new edge type button myAddEdgeTypeButton = GUIDesigns::buildFXButton(horizontalFrameButtons, TL("Add"), "", TL("Add edge type"), GUIIconSubSys::getIcon(GUIIcon::ADD), - this, MID_GNE_CREATEEDGEFRAME_ADD, GUIDesignButton); + this, MID_GNE_CREATEEDGEFRAME_ADD, GUIDesignButton); // create delete edge type button myDeleteEdgeTypeButton = GUIDesigns::buildFXButton(horizontalFrameButtons, TL("Delete"), "", TL("Delete edge type"), GUIIconSubSys::getIcon(GUIIcon::REMOVE), - this, MID_GNE_CREATEEDGEFRAME_DELETE, GUIDesignButton); + this, MID_GNE_CREATEEDGEFRAME_DELETE, GUIDesignButton); // create delete edge type button myCreateFromTemplate = GUIDesigns::buildFXButton(getCollapsableFrame(), TL("Create from template"), "", TL("Create edgeType from template"), GUIIconSubSys::getIcon(GUIIcon::EDGE), - this, MID_GNE_CREATEEDGEFRAME_CREATEFROMTEMPLATE, GUIDesignButton); + this, MID_GNE_CREATEEDGEFRAME_CREATEFROMTEMPLATE, GUIDesignButton); // by default, create custom edge myCreateDefaultEdgeType->setCheck(TRUE); // check if enable disable pedestrians @@ -902,7 +902,7 @@ GNECreateEdgeFrame::disablePedestrians(GNEEdge* edge) const { void -GNECreateEdgeFrame::addBikelane(GNEEdge* edge, const std::string &bikelaneWidth) const { +GNECreateEdgeFrame::addBikelane(GNEEdge* edge, const std::string& bikelaneWidth) const { bool bikelaneFound = false; // iterate over lanes for (const auto& lane : edge->getLanes()) { @@ -923,7 +923,7 @@ GNECreateEdgeFrame::addBikelane(GNEEdge* edge, const std::string &bikelaneWidth) void -GNECreateEdgeFrame::addSidewalk(GNEEdge* edge, const std::string &sidewalkWidth) const { +GNECreateEdgeFrame::addSidewalk(GNEEdge* edge, const std::string& sidewalkWidth) const { bool sidewalkFound = false; // iterate over lanes for (const auto& lane : edge->getLanes()) { diff --git a/src/netedit/frames/network/GNECreateEdgeFrame.h b/src/netedit/frames/network/GNECreateEdgeFrame.h index 2a109caaaa2a..f6cf3d2e413b 100644 --- a/src/netedit/frames/network/GNECreateEdgeFrame.h +++ b/src/netedit/frames/network/GNECreateEdgeFrame.h @@ -309,10 +309,10 @@ class GNECreateEdgeFrame : public GNEFrame { void disablePedestrians(GNEEdge* edge) const; /// @brief add sidewalk in the given edge - void addSidewalk(GNEEdge* edge, const std::string &sidewalkWidth) const; + void addSidewalk(GNEEdge* edge, const std::string& sidewalkWidth) const; /// @brief add bikelane in the given edge - void addBikelane(GNEEdge* edge, const std::string &bikelaneWidth) const; + void addBikelane(GNEEdge* edge, const std::string& bikelaneWidth) const; private: /// @brief source junction for new edge diff --git a/src/netwrite/NWWriter_DlrNavteq.cpp b/src/netwrite/NWWriter_DlrNavteq.cpp index caa6eeac925b..3ac9f82b2669 100644 --- a/src/netwrite/NWWriter_DlrNavteq.cpp +++ b/src/netwrite/NWWriter_DlrNavteq.cpp @@ -140,7 +140,7 @@ NWWriter_DlrNavteq::writeNodesUnsplitted(const OptionsCont& oc, const NBNodeCont avoid.insert(avoid.end(), reservedNodeIDs.begin(), reservedNodeIDs.end()); } IDSupplier idSupplier("", avoid); - for (const auto& edgeIt: ec) { + for (const auto& edgeIt : ec) { const NBEdge* const e = edgeIt.second; PositionVector geom = e->getGeometry(); if (geom.size() > 2) { @@ -167,9 +167,9 @@ NWWriter_DlrNavteq::writeNodesUnsplitted(const OptionsCont& oc, const NBNodeCont if (geom.size() > 2) { // move2side might have changed the number of nodes std::string internalNodeID = e->getID(); if (internalNodeID == UNDEFINED - || (nc.retrieve(internalNodeID) != nullptr) - || reservedNodeIDs.count(internalNodeID) > 0 - ) { + || (nc.retrieve(internalNodeID) != nullptr) + || reservedNodeIDs.count(internalNodeID) > 0 + ) { // need to invent a new name to avoid clashing with the id of a 'real' node or a reserved name if (numericalIDs) { internalNodeID = idSupplier.getNext(); diff --git a/src/utils/geom/Boundary.cpp b/src/utils/geom/Boundary.cpp index 995e0c1edc4c..7813e0cfa898 100644 --- a/src/utils/geom/Boundary.cpp +++ b/src/utils/geom/Boundary.cpp @@ -222,8 +222,8 @@ Boundary::crosses(const Position& p1, const Position& p2) const { double Boundary::contains(const Boundary& b) const { - if ((myXmin <= b.xmin()) && (myYmin <= b.ymin()) && - (myXmax >= b.xmax()) && (myYmax >= b.ymax())) { + if ((myXmin <= b.xmin()) && (myYmin <= b.ymin()) && + (myXmax >= b.xmax()) && (myYmax >= b.ymax())) { return true; } else { return false; diff --git a/src/utils/geom/GeomHelper.cpp b/src/utils/geom/GeomHelper.cpp index 2509b2752b6f..b81e4f39c875 100644 --- a/src/utils/geom/GeomHelper.cpp +++ b/src/utils/geom/GeomHelper.cpp @@ -95,8 +95,8 @@ GeomHelper::nearest_offset_on_line_to_point2D(const Position& lineStart, // scalar product equals length of orthogonal projection times length of vector being projected onto // dividing the scalar product by the distance gives the relative position const double u = (((p.x() - lineStart.x()) * (lineEnd.x() - lineStart.x())) + - ((p.y() - lineStart.y()) * (lineEnd.y() - lineStart.y())) - ) / lineLength2D; + ((p.y() - lineStart.y()) * (lineEnd.y() - lineStart.y())) + ) / lineLength2D; if (u < 0. || u > lineLength2D) { // closest point does not fall within the line segment if (perpendicular) { return INVALID_OFFSET; diff --git a/src/utils/gui/div/GLHelper.cpp b/src/utils/gui/div/GLHelper.cpp index 80eb620184e4..effd2dca9faf 100644 --- a/src/utils/gui/div/GLHelper.cpp +++ b/src/utils/gui/div/GLHelper.cpp @@ -280,10 +280,10 @@ GLHelper::drawRectangle(const Position& center, const double width, const double GLHelper::pushMatrix(); glTranslated(center.x(), center.y(), 0); glBegin(GL_QUADS); - glVertex2d(-halfWidth, halfHeight); - glVertex2d(-halfWidth, -halfHeight); - glVertex2d(halfWidth, -halfHeight); - glVertex2d(halfWidth , halfHeight); + glVertex2d(-halfWidth, halfHeight); + glVertex2d(-halfWidth, -halfHeight); + glVertex2d(halfWidth, -halfHeight); + glVertex2d(halfWidth, halfHeight); glEnd(); GLHelper::popMatrix(); #ifdef CHECK_ELEMENTCOUNTER @@ -298,10 +298,10 @@ GLHelper::drawBoxLine(const Position& beg, double rot, double visLength, glTranslated(beg.x(), beg.y(), 0); glRotated(rot, 0, 0, 1); glBegin(GL_QUADS); - glVertex2d(-width - offset, 0); - glVertex2d(-width - offset, -visLength); - glVertex2d(width - offset, -visLength); - glVertex2d(width - offset, 0); + glVertex2d(-width - offset, 0); + glVertex2d(-width - offset, -visLength); + glVertex2d(width - offset, -visLength); + glVertex2d(width - offset, 0); glEnd(); GLHelper::popMatrix(); #ifdef CHECK_ELEMENTCOUNTER @@ -318,10 +318,10 @@ GLHelper::drawBoxLine(const Position& beg1, const Position& beg2, glTranslated((beg2.x() + beg1.x())*.5, (beg2.y() + beg1.y())*.5, 0); glRotated(rot, 0, 0, 1); glBegin(GL_QUADS); - glVertex2d(-width, 0); - glVertex2d(-width, -visLength); - glVertex2d(width, -visLength); - glVertex2d(width, 0); + glVertex2d(-width, 0); + glVertex2d(-width, -visLength); + glVertex2d(width, -visLength); + glVertex2d(width, 0); glEnd(); GLHelper::popMatrix(); #ifdef CHECK_ELEMENTCOUNTER @@ -513,8 +513,8 @@ GLHelper::drawLine(const Position& beg, const Position& end) { void -GLHelper::drawFilledCircleDetailled(const GUIVisualizationSettings::Detail d,const double radius, - double beg, double end) { +GLHelper::drawFilledCircleDetailled(const GUIVisualizationSettings::Detail d, const double radius, + double beg, double end) { // get current resolution level switch (d) { case GUIVisualizationSettings::Detail::CircleResolution32: @@ -553,10 +553,10 @@ GLHelper::drawFilledCircleDetailled(const GUIVisualizationSettings::Detail d, co // draw only a square GLHelper::pushMatrix(); glBegin(GL_QUADS); - glVertex2d(-radius, radius); - glVertex2d(-radius, -radius); - glVertex2d(radius, -radius); - glVertex2d(radius, radius); + glVertex2d(-radius, radius); + glVertex2d(-radius, -radius); + glVertex2d(radius, -radius); + glVertex2d(radius, radius); glEnd(); GLHelper::popMatrix(); #ifdef CHECK_ELEMENTCOUNTER @@ -872,8 +872,8 @@ GLHelper::drawCrossTies(const PositionVector& geom, const std::vector& r glBegin(GL_QUADS); glVertex2d(-halfWidth - offset, -t); glVertex2d(-halfWidth - offset, -t - length); - glVertex2d( halfWidth - offset, -t - length); - glVertex2d( halfWidth - offset, -t); + glVertex2d(halfWidth - offset, -t - length); + glVertex2d(halfWidth - offset, -t); glEnd(); #ifdef CHECK_ELEMENTCOUNTER myVertexCounter += 4; @@ -884,8 +884,8 @@ GLHelper::drawCrossTies(const PositionVector& geom, const std::vector& r glBegin(GL_QUADS); glVertex2d(-halfWidth - offset, 0); glVertex2d(-halfWidth - offset, -lengths.back()); - glVertex2d( halfWidth - offset, -lengths.back()); - glVertex2d( halfWidth - offset, 0); + glVertex2d(halfWidth - offset, -lengths.back()); + glVertex2d(halfWidth - offset, 0); glEnd(); #ifdef CHECK_ELEMENTCOUNTER myVertexCounter += 4; diff --git a/src/utils/gui/div/GUIDottedGeometry.h b/src/utils/gui/div/GUIDottedGeometry.h index df2800218d55..bd51b66f4c4b 100644 --- a/src/utils/gui/div/GUIDottedGeometry.h +++ b/src/utils/gui/div/GUIDottedGeometry.h @@ -119,7 +119,7 @@ class GUIDottedGeometry { Position getBackPosition() const; /// @brief get simple shape (the shape without resampling) - const PositionVector &getUnresampledShape() const; + const PositionVector& getUnresampledShape() const; private: /// @brief calculate shape rotations and lengths diff --git a/src/utils/gui/div/GUIGeometry.cpp b/src/utils/gui/div/GUIGeometry.cpp index 044587d680a5..050b51961c09 100644 --- a/src/utils/gui/div/GUIGeometry.cpp +++ b/src/utils/gui/div/GUIGeometry.cpp @@ -291,7 +291,7 @@ GUIGeometry::drawGeometry(const GUIVisualizationSettings::Detail d, const GUIGeo // continue depending of detail level if (d <= GUIVisualizationSettings::Detail::GeometryBoxLines) { GLHelper::drawBoxLines(geometry.getShape(), geometry.getShapeRotations(), geometry.getShapeLengths(), colors, width, 0, offset); - } else{ + } else { // set first color GLHelper::setColor(*colors.begin()); // set width @@ -338,7 +338,7 @@ GUIGeometry::drawContourGeometry(const GUIGeometry& geometry, const double width void -GUIGeometry::drawGeometryPoints(const GUIVisualizationSettings::Detail d, const PositionVector &shape, +GUIGeometry::drawGeometryPoints(const GUIVisualizationSettings::Detail d, const PositionVector& shape, const RGBColor& color, const double radius, const double exaggeration, const bool editingElevation) { // check detail level diff --git a/src/utils/gui/div/GUIGeometry.h b/src/utils/gui/div/GUIGeometry.h index 5bff3968f73d..b8308cdb4595 100644 --- a/src/utils/gui/div/GUIGeometry.h +++ b/src/utils/gui/div/GUIGeometry.h @@ -103,7 +103,7 @@ class GUIGeometry { static void drawContourGeometry(const GUIGeometry& geometry, const double width, const bool drawExtremes = false); /// @brief draw geometry points - static void drawGeometryPoints(const GUIVisualizationSettings::Detail d, const PositionVector &shape, + static void drawGeometryPoints(const GUIVisualizationSettings::Detail d, const PositionVector& shape, const RGBColor& color, const double radius, const double exaggeration, const bool editingElevation); diff --git a/src/utils/gui/div/GUIViewObjectsHandler.cpp b/src/utils/gui/div/GUIViewObjectsHandler.cpp index 12eee4b4488d..a453c6d8cac2 100644 --- a/src/utils/gui/div/GUIViewObjectsHandler.cpp +++ b/src/utils/gui/div/GUIViewObjectsHandler.cpp @@ -62,7 +62,7 @@ GUIViewObjectsHandler::getSelectionBoundary() const { void -GUIViewObjectsHandler::setSelectionPosition(const Position &pos) { +GUIViewObjectsHandler::setSelectionPosition(const Position& pos) { // set position selection mySelectionPosition = pos; // invalidate selection boundary @@ -72,7 +72,7 @@ GUIViewObjectsHandler::setSelectionPosition(const Position &pos) { void -GUIViewObjectsHandler::setSelectionBoundary(const Boundary &boundary) { +GUIViewObjectsHandler::setSelectionBoundary(const Boundary& boundary) { // invalidate position selection mySelectionPosition = Position::INVALID; // set selection boundary @@ -107,7 +107,7 @@ GUIViewObjectsHandler::checkBoundaryParentElement(const GUIGlObject* GLObject, c bool GUIViewObjectsHandler::checkCircleElement(const GUIVisualizationSettings::Detail d, const GUIGlObject* GLObject, - const Position ¢er, const double radius, const Boundary &circleBoundary) { + const Position& center, const double radius, const Boundary& circleBoundary) { // first check that object doesn't exist if (isElementSelected(GLObject)) { return false; @@ -131,7 +131,7 @@ GUIViewObjectsHandler::checkCircleElement(const GUIVisualizationSettings::Detail return addElementUnderCursor(GLObject, false, false); } // check if the four boundary vertex are within circle - for (const auto &vertex : mySelectionBoundaryShape) { + for (const auto& vertex : mySelectionBoundaryShape) { if (vertex.distanceSquaredTo2D(center) <= squaredRadius) { return addElementUnderCursor(GLObject, false, false); } @@ -162,7 +162,7 @@ GUIViewObjectsHandler::checkCircleElement(const GUIVisualizationSettings::Detail bool GUIViewObjectsHandler::checkGeometryPoint(const GUIVisualizationSettings::Detail d, const GUIGlObject* GLObject, - const PositionVector &shape, const int index, const double radius) { + const PositionVector& shape, const int index, const double radius) { // obtain geometry point pos const auto geometryPointPos = shape[index]; // declare squared radius @@ -182,7 +182,7 @@ GUIViewObjectsHandler::checkGeometryPoint(const GUIVisualizationSettings::Detail return addGeometryPointUnderCursor(GLObject, index); } else { // check if the four boundary vertex are within circle - for (const auto &vertex : mySelectionBoundaryShape) { + for (const auto& vertex : mySelectionBoundaryShape) { if (vertex.distanceSquaredTo2D(geometryPointPos) <= squaredRadius) { return addGeometryPointUnderCursor(GLObject, index); } @@ -213,7 +213,7 @@ GUIViewObjectsHandler::checkGeometryPoint(const GUIVisualizationSettings::Detail bool GUIViewObjectsHandler::checkPositionOverShape(const GUIVisualizationSettings::Detail d, const GUIGlObject* GLObject, - const PositionVector &shape, const double distance) { + const PositionVector& shape, const double distance) { // only process if we're selecting a precise position if ((mySelectionPosition != Position::INVALID) && (d <= GUIVisualizationSettings::Detail::PreciseSelection)) { // obtain nearest position over shape @@ -232,12 +232,12 @@ GUIViewObjectsHandler::checkPositionOverShape(const GUIVisualizationSettings::De bool -GUIViewObjectsHandler::checkShapeElement(const GUIGlObject* GLObject, const PositionVector &shape, - const Boundary &shapeBoundary) { +GUIViewObjectsHandler::checkShapeElement(const GUIGlObject* GLObject, const PositionVector& shape, + const Boundary& shapeBoundary) { // first check that object doesn't exist if (isElementSelected(GLObject)) { return false; - }else if (mySelectionBoundary.isInitialised()) { + } else if (mySelectionBoundary.isInitialised()) { // avoid invalid boundaries if (!shapeBoundary.isInitialised()) { return false; @@ -248,7 +248,7 @@ GUIViewObjectsHandler::checkShapeElement(const GUIGlObject* GLObject, const Posi } // check if shape crosses to selection boundary for (int i = 1; i < (int)shape.size(); i++) { - if (mySelectionBoundary.crosses(shape[i-1], shape[i])) { + if (mySelectionBoundary.crosses(shape[i - 1], shape[i])) { return addElementUnderCursor(GLObject, false, false); } } @@ -276,10 +276,10 @@ GUIViewObjectsHandler::addElementUnderCursor(const GUIGlObject* GLObject, const // check if this is an element with an associated layer const auto layer = dynamic_cast(GLObject); if (layer) { - auto &layerContainer = mySortedSelectedObjects[layer->getShapeLayer() * -1]; + auto& layerContainer = mySortedSelectedObjects[layer->getShapeLayer() * -1]; layerContainer.insert(layerContainer.begin(), ObjectContainer(GLObject)); } else if (GLObject) { - auto &layerContainer = mySortedSelectedObjects[GLObject->getType() * -1]; + auto& layerContainer = mySortedSelectedObjects[GLObject->getType() * -1]; layerContainer.insert(layerContainer.begin(), ObjectContainer(GLObject)); } mySelectedObjects[GLObject] = fullBoundary; @@ -291,11 +291,11 @@ GUIViewObjectsHandler::addElementUnderCursor(const GUIGlObject* GLObject, const bool GUIViewObjectsHandler::addGeometryPointUnderCursor(const GUIGlObject* GLObject, const int newIndex) { // avoid to insert duplicated elements - for (auto &elementLayer : mySortedSelectedObjects) { - for (auto &element : elementLayer.second) { + for (auto& elementLayer : mySortedSelectedObjects) { + for (auto& element : elementLayer.second) { if (element.object == GLObject) { // avoid double points - for (auto &index : element.geometryPoints) { + for (auto& index : element.geometryPoints) { if (index == newIndex) { return false; } @@ -309,11 +309,11 @@ GUIViewObjectsHandler::addGeometryPointUnderCursor(const GUIGlObject* GLObject, // no element found then add it const auto layer = dynamic_cast(GLObject); if (layer) { - auto &layerContainer = mySortedSelectedObjects[layer->getShapeLayer() * -1]; + auto& layerContainer = mySortedSelectedObjects[layer->getShapeLayer() * -1]; auto it = layerContainer.insert(layerContainer.begin(), ObjectContainer(GLObject)); it->geometryPoints.push_back(newIndex); } else if (GLObject) { - auto &layerContainer = mySortedSelectedObjects[GLObject->getType() * -1]; + auto& layerContainer = mySortedSelectedObjects[GLObject->getType() * -1]; auto it = layerContainer.insert(layerContainer.begin(), ObjectContainer(GLObject)); it->geometryPoints.push_back(newIndex); } @@ -323,10 +323,10 @@ GUIViewObjectsHandler::addGeometryPointUnderCursor(const GUIGlObject* GLObject, bool -GUIViewObjectsHandler::addPositionOverShape(const GUIGlObject* GLObject, const Position &pos, const double offset) { +GUIViewObjectsHandler::addPositionOverShape(const GUIGlObject* GLObject, const Position& pos, const double offset) { // avoid to insert duplicated elements - for (auto &elementLayer : mySortedSelectedObjects) { - for (auto &element : elementLayer.second) { + for (auto& elementLayer : mySortedSelectedObjects) { + for (auto& element : elementLayer.second) { if (element.object == GLObject) { if (element.posOverShape != Position::INVALID) { return false; @@ -342,11 +342,11 @@ GUIViewObjectsHandler::addPositionOverShape(const GUIGlObject* GLObject, const P // no element found then add it const auto layer = dynamic_cast(GLObject); if (layer) { - auto &layerContainer = mySortedSelectedObjects[layer->getShapeLayer() * -1]; + auto& layerContainer = mySortedSelectedObjects[layer->getShapeLayer() * -1]; auto it = layerContainer.insert(layerContainer.begin(), ObjectContainer(GLObject)); it->posOverShape = pos; } else if (GLObject) { - auto &layerContainer = mySortedSelectedObjects[GLObject->getType() * -1]; + auto& layerContainer = mySortedSelectedObjects[GLObject->getType() * -1]; auto it = layerContainer.insert(layerContainer.begin(), ObjectContainer(GLObject)); it->posOverShape = pos; } @@ -364,8 +364,8 @@ GUIViewObjectsHandler::getSelectedObjects() const { const std::vector& GUIViewObjectsHandler::getGeometryPoints(const GUIGlObject* GLObject) const { // avoid to insert duplicated elements - for (auto &elementLayer : mySortedSelectedObjects) { - for (auto &element : elementLayer.second) { + for (auto& elementLayer : mySortedSelectedObjects) { + for (auto& element : elementLayer.second) { if (element.object == GLObject) { return element.geometryPoints; } @@ -378,8 +378,8 @@ GUIViewObjectsHandler::getGeometryPoints(const GUIGlObject* GLObject) const { const Position& GUIViewObjectsHandler::getPositionOverShape(const GUIGlObject* GLObject) const { // avoid to insert duplicated elements - for (auto &elementLayer : mySortedSelectedObjects) { - for (auto &element : elementLayer.second) { + for (auto& elementLayer : mySortedSelectedObjects) { + for (auto& element : elementLayer.second) { if (element.object == GLObject) { return element.posOverShape; } @@ -393,7 +393,7 @@ void GUIViewObjectsHandler::updateFrontElement(const GUIGlObject* GLObject) { ObjectContainer frontElement(nullptr); // extract element - for (auto &elementLayer : mySortedSelectedObjects) { + for (auto& elementLayer : mySortedSelectedObjects) { auto it = elementLayer.second.begin(); while (it != elementLayer.second.end()) { if (it->object == GLObject) { diff --git a/src/utils/gui/div/GUIViewObjectsHandler.h b/src/utils/gui/div/GUIViewObjectsHandler.h index 738ed868035d..de31c12698ce 100644 --- a/src/utils/gui/div/GUIViewObjectsHandler.h +++ b/src/utils/gui/div/GUIViewObjectsHandler.h @@ -69,16 +69,16 @@ class GUIViewObjectsHandler { void clearSelectedElements(); /// @brief get selection position (usually the mouse position) - const Position &getSelectionPosition() const; + const Position& getSelectionPosition() const; /// @brief get selection boundary (usually the mouse position) - const Boundary &getSelectionBoundary() const; + const Boundary& getSelectionBoundary() const; /// @brief set selection position (usually the mouse position) - void setSelectionPosition(const Position &pos); + void setSelectionPosition(const Position& pos); /// @brief set selection boundary (usually the mouse position) - void setSelectionBoundary(const Boundary &boundary); + void setSelectionBoundary(const Boundary& boundary); /// @brief check if element was already selected bool isElementSelected(const GUIGlObject* GLObject) const; @@ -88,19 +88,19 @@ class GUIViewObjectsHandler { /// @brief check if mouse is within elements geometry (for circles) bool checkCircleElement(const GUIVisualizationSettings::Detail d, const GUIGlObject* GLObject, - const Position ¢er, const double radius, const Boundary &circleBoundary); + const Position& center, const double radius, const Boundary& circleBoundary); /// @brief check if mouse is within geometry point bool checkGeometryPoint(const GUIVisualizationSettings::Detail d, const GUIGlObject* GLObject, - const PositionVector &shape, const int index, const double radius); + const PositionVector& shape, const int index, const double radius); /// @brief check if mouse is within geometry point bool checkPositionOverShape(const GUIVisualizationSettings::Detail d, const GUIGlObject* GLObject, - const PositionVector &shape, const double distance); + const PositionVector& shape, const double distance); /// @brief check (closed) shape element - bool checkShapeElement(const GUIGlObject* GLObject, const PositionVector &shape, - const Boundary &shapeBoundary); + bool checkShapeElement(const GUIGlObject* GLObject, const PositionVector& shape, + const Boundary& shapeBoundary); /// @brief add element into list of elements under cursor bool addElementUnderCursor(const GUIGlObject* GLObject, const bool checkDuplicated, const bool fullBoundary); @@ -109,7 +109,7 @@ class GUIViewObjectsHandler { bool addGeometryPointUnderCursor(const GUIGlObject* GLObject, const int newIndex); /// @brief add position over shape - bool addPositionOverShape(const GUIGlObject* GLObject, const Position &pos, const double offset); + bool addPositionOverShape(const GUIGlObject* GLObject, const Position& pos, const double offset); /// @brief get all elements under cursor sorted by layer const GLObjectsSortedContainer& getSelectedObjects() const; diff --git a/src/utils/gui/images/GUIIcons.h b/src/utils/gui/images/GUIIcons.h index f3e208d17dbc..0615a7d8e3a1 100644 --- a/src/utils/gui/images/GUIIcons.h +++ b/src/utils/gui/images/GUIIcons.h @@ -468,8 +468,8 @@ enum class GUIIcon { POIICON_PIN, POIICON_NATURE, POIICON_HOTEL, - POIICON_FUEL, - POIICON_CHARGING_STATION, + POIICON_FUEL, + POIICON_CHARGING_STATION, /// @} /// @name juPedSim elements diff --git a/src/utils/gui/images/textures/POITextures/Charging_station.cpp b/src/utils/gui/images/textures/POITextures/Charging_station.cpp index fab861f5c5a7..1e8c82f0fdc7 100644 --- a/src/utils/gui/images/textures/POITextures/Charging_station.cpp +++ b/src/utils/gui/images/textures/POITextures/Charging_station.cpp @@ -21,246 +21,246 @@ const unsigned char POITexture_Charging_station[] = { - 0x47,0x49,0x46,0x38,0x39,0x61,0x00,0x02,0x00,0x02,0x80,0x01,0x00,0x00,0x00,0x00, - 0xff,0xff,0xff,0x21,0xfe,0x11,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69, - 0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x00,0x21,0xf9,0x04,0x01,0x0a,0x00,0x01,0x00, - 0x2c,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x02,0x00,0x02,0xfe,0x8c,0x8f,0xa9,0xcb, - 0xed,0x0f,0xa3,0x9c,0xb4,0xda,0x8b,0xb3,0xde,0xbc,0xfb,0x0f,0x86,0xe2,0x48,0x96, - 0xe6,0x01,0xa4,0xea,0xca,0xb6,0xee,0x0b,0xc7,0xf2,0x4c,0xd7,0xf6,0x8d,0xe7,0xfa, - 0x0e,0x9c,0xfe,0x0f,0x0c,0x0a,0x87,0x22,0x9e,0xf1,0x88,0x4c,0x2a,0x97,0xcc,0x24, - 0xf1,0x09,0x8d,0x4a,0xa7,0x98,0xa6,0xf5,0x8a,0xcd,0x6a,0xb7,0x2c,0xaa,0xf7,0x0b, - 0x0e,0x17,0xb9,0xe4,0xb2,0xf9,0x8c,0x56,0x89,0xd7,0xec,0xb6,0x3b,0x0d,0x8f,0xcb, - 0xe7,0x3a,0xb7,0xfd,0x8e,0xf7,0xd1,0xf7,0xfc,0x7e,0x3f,0x0f,0x18,0x28,0x48,0xe1, - 0x57,0x68,0x78,0x68,0x36,0xa8,0xb8,0x18,0x88,0xe8,0xf8,0x08,0xb9,0xc4,0x38,0x49, - 0x09,0x16,0x79,0x89,0x99,0x49,0x53,0xc9,0xd9,0x19,0xa4,0x09,0x1a,0x2a,0xda,0xe3, - 0x59,0x6a,0xda,0x31,0x9a,0xaa,0x0a,0x79,0xda,0xea,0x3a,0xb1,0x1a,0x2b,0x5b,0xf8, - 0x5a,0x6b,0x6b,0x30,0x9b,0xab,0x3b,0x77,0xdb,0x6b,0xba,0x0b,0x1c,0x7c,0xe6,0x4b, - 0x3c,0x29,0x7c,0x8c,0x9c,0x55,0xbc,0xdc,0x98,0xec,0xfc,0xec,0xc4,0x2c,0xdd,0x06, - 0x5d,0x6d,0x5d,0x37,0x9d,0xfd,0x75,0xcd,0xdd,0x3d,0xa3,0x0d,0x1e,0xe5,0x3d,0x4e, - 0xde,0x15,0x7e,0x0e,0x54,0xae,0x5e,0x8e,0xde,0x5e,0xb2,0x0e,0x3f,0xee,0x3e,0xff, - 0x11,0x6f,0xdf,0x4d,0x9f,0x9f,0x71,0xcf,0x7f,0xad,0xff,0x0f,0xab,0x9f,0x40,0x68, - 0x00,0x0b,0x36,0x18,0x88,0xf0,0x99,0xc1,0x85,0x08,0x12,0x3a,0x3c,0xc6,0x90,0xe1, - 0xc3,0x89,0xc1,0x22,0x16,0xa4,0x88,0x71,0x97,0x45,0xfe,0x7d,0x19,0x3b,0xce,0xda, - 0x98,0xcf,0xa3,0xc8,0x55,0x20,0xdd,0x8d,0x3c,0x99,0xaa,0x24,0x3a,0x94,0x2c,0x41, - 0xa9,0x0c,0xd7,0x32,0x66,0xa6,0x97,0xd9,0x64,0xda,0x8c,0x44,0x73,0xda,0xcd,0x9d, - 0x8e,0x72,0x2e,0xe3,0x09,0xd4,0x90,0xcf,0x62,0x41,0x8b,0xfe,0x19,0x7a,0xcb,0xa8, - 0x52,0x3a,0x48,0x93,0x2e,0x7d,0x0a,0xa7,0x69,0x2d,0xa8,0x54,0x87,0x49,0x6d,0x55, - 0x35,0x6b,0x99,0xab,0xa7,0xb4,0x7a,0xd5,0xc2,0xb5,0xd4,0xd7,0xb1,0x57,0xc2,0x7a, - 0x22,0x8b,0x96,0x89,0x59,0x4e,0x69,0xdb,0x22,0x59,0x5b,0xc9,0xad,0xdc,0x1d,0x70, - 0x8d,0xcd,0xbd,0x8b,0xa3,0xee,0x22,0xbc,0x7c,0x6b,0xe8,0x55,0xd4,0x37,0x70,0x8c, - 0xbf,0x82,0x04,0x1b,0x76,0x41,0xb8,0xd9,0xe1,0xc5,0x29,0x12,0xe7,0x61,0x0c,0xd9, - 0x31,0x1e,0xc8,0x8c,0x25,0xdf,0xa1,0xbc,0xd8,0xb2,0x1d,0xcc,0x87,0x35,0x53,0xe3, - 0x6c,0xd8,0x33,0x1b,0xd0,0x9d,0x45,0x87,0x21,0x1d,0xda,0xb4,0x25,0xd4,0x81,0x55, - 0xaf,0x66,0xcd,0xd7,0xf5,0x36,0xd8,0xb1,0x65,0x53,0xa1,0x5d,0xdb,0xb6,0x14,0xdc, - 0x78,0x75,0x4f,0xe1,0x7d,0xd7,0xf7,0x6e,0xe0,0x72,0x85,0x8b,0x23,0xee,0xd6,0x38, - 0x14,0xe4,0xc9,0x95,0x13,0x61,0xde,0xd6,0xf9,0x73,0xe8,0x68,0xa5,0x0f,0xa1,0x5e, - 0xdd,0xfa,0x27,0xec,0x63,0xb5,0x6f,0xe7,0xee,0xd5,0x7b,0x3a,0xf0,0xe1,0xc5,0xeb, - 0x21,0xaf,0xd5,0xfc,0x79,0xf4,0x55,0xd5,0x9f,0x60,0x9f,0xd5,0xbd,0x09,0xf8,0xed, - 0xe5,0x93,0xa0,0x4f,0xd5,0xfe,0x7d,0xfc,0x4f,0xfe,0xf5,0x8f,0xe0,0xdf,0x9f,0x7f, - 0x21,0x00,0xb8,0x94,0x80,0x03,0x12,0x68,0x94,0x81,0x20,0x20,0x98,0xa0,0x82,0x1e, - 0x30,0x58,0x94,0x83,0x0f,0x42,0x08,0x94,0x84,0xa8,0x50,0xc8,0x93,0x85,0x1c,0x60, - 0x98,0xa1,0x86,0x1a,0x70,0xb8,0x93,0x87,0x1f,0x82,0x68,0x93,0x88,0xfb,0x90,0x28, - 0x93,0x89,0x55,0xa0,0x18,0x93,0x8a,0x17,0xb0,0xd8,0xa2,0x8b,0x15,0xc0,0xd8,0x92, - 0x8c,0x33,0xd2,0x88,0x92,0x8d,0x84,0xe0,0x78,0x92,0x8e,0x01,0xf1,0x28,0x92,0x8f, - 0x12,0x00,0x39,0x92,0x90,0x11,0x10,0x19,0xa4,0x91,0x0f,0x20,0xe9,0x91,0x92,0x4b, - 0x32,0x99,0x91,0x93,0x0e,0x40,0x19,0xa5,0x94,0x0c,0x50,0x89,0x91,0x95,0x57,0x62, - 0x39,0x91,0x96,0x0b,0x70,0xd9,0xa5,0x97,0x09,0x80,0xf9,0x90,0x98,0x63,0x92,0x99, - 0x90,0x99,0x0d,0xa1,0x89,0x90,0x9a,0x28,0xb0,0x39,0x90,0x9b,0xb8,0xc0,0x29,0x90, - 0x9c,0x01,0xd0,0x59,0xa7,0x9c,0x78,0xf6,0x63,0xe7,0x9e,0xfc,0xf4,0xe9,0xa7,0x3d, - 0x80,0x06,0x0a,0xcf,0xa0,0x84,0xaa,0x63,0xe8,0xa1,0xe4,0x24,0xaa,0xa8,0x37,0x8c, - 0x36,0xca,0xcd,0xa3,0x90,0x5a,0x23,0xe9,0xa4,0x04,0xe9,0x69,0xa9,0xa3,0x98,0x66, - 0x1a,0xe9,0xa6,0x9c,0x52,0xea,0xe9,0xa7,0x97,0xba,0x29,0xaa,0x3f,0xa1,0x96,0x9a, - 0x4c,0xa5,0xa8,0x02,0xa3,0x2a,0x85,0x4f,0xc6,0x79,0x2a,0x87,0x3f,0xfe,0x19,0x2b, - 0x84,0x2f,0xd2,0x4a,0x2a,0x89,0x27,0x0a,0x5a,0x2b,0x81,0x1b,0xdc,0xd3,0x2a,0x7d, - 0x17,0x16,0xda,0xab,0xb0,0xf5,0x10,0x9b,0xfe,0x2b,0x83,0x07,0xae,0x13,0x2c,0x78, - 0xff,0x31,0x5b,0x2c,0x79,0xfb,0x21,0x1a,0x2d,0x77,0xf3,0x51,0x9b,0x2c,0x7e,0xef, - 0x61,0xab,0x26,0x80,0xeb,0x2d,0x5a,0x2d,0x72,0xe3,0xb1,0x13,0x2e,0x70,0x42,0x70, - 0x6b,0x26,0x7c,0xd7,0x91,0x9b,0xad,0xb5,0xeb,0x82,0xdb,0x2e,0x75,0xd3,0xb1,0xdb, - 0xad,0xb3,0xf3,0xc2,0x5b,0x2f,0x76,0xcb,0xa1,0x2b,0xa6,0xbb,0x4f,0x40,0x1b,0x2f, - 0x6f,0xc3,0xf1,0xeb,0x25,0x74,0xbf,0x01,0x9c,0xaf,0xb9,0x07,0x13,0xac,0xa5,0xb8, - 0x0b,0x33,0x6c,0x25,0x71,0x5e,0xc4,0xd3,0x6c,0x65,0xb7,0x51,0x5c,0x6e,0x69,0x17, - 0x23,0x9b,0x30,0x69,0xaf,0x71,0x9c,0x2e,0x6b,0xa7,0xf1,0x1a,0x70,0x64,0x23,0x63, - 0x5c,0x72,0x66,0x27,0xa3,0xdc,0xb1,0xc9,0x2b,0x83,0xec,0x54,0x0b,0xcf,0xca,0xfc, - 0x06,0x67,0x6b,0xf0,0xe9,0xcb,0x37,0xc7,0xc2,0xf0,0x19,0x65,0xa3,0xe1,0x6a,0x8b, - 0x5f,0xc3,0x0e,0x76,0xb3,0xcb,0x62,0xe4,0x19,0xb4,0x0d,0x1b,0x0a,0xfd,0xb2,0x60, - 0x35,0x03,0xfd,0x4a,0x5e,0xbb,0x32,0x3d,0x9b,0xc6,0x3f,0x43,0x8d,0x95,0xd4,0xb7, - 0xde,0x70,0xb4,0xd5,0x45,0xe3,0x3c,0x95,0xd6,0x16,0x60,0x53,0x75,0x6b,0x9b,0x21, - 0xed,0x0a,0x5d,0x5b,0x73,0xfd,0x71,0x6e,0x3d,0x83,0x9d,0x36,0xd9,0x37,0x8a,0xbd, - 0xb1,0xdb,0x6f,0x63,0xfd,0x8b,0xdc,0x3b,0xd2,0xfd,0xf0,0x5c,0x8f,0xb5,0x19,0x76, - 0x0e,0x2b,0xf2,0x3d,0xb0,0xdf,0x7f,0xc3,0x1a,0xb5,0xde,0xb3,0x2a,0xdd,0x76,0x74, - 0x80,0xa4,0x19,0x38,0xe1,0x47,0x0a,0xfe,0xde,0x78,0x76,0x87,0x23,0x1e,0x37,0xe5, - 0x63,0x6b,0x3e,0x71,0x71,0x8a,0x61,0x9e,0x35,0xe7,0x7b,0xb3,0x5d,0xb6,0xe5,0x97, - 0x83,0xde,0x95,0xe2,0x43,0x8a,0xde,0x77,0x77,0x85,0x39,0x94,0x34,0xeb,0xab,0x4b, - 0xbe,0x2f,0x59,0x80,0x95,0x19,0x39,0xe9,0x73,0xeb,0x5e,0x77,0x79,0x83,0x84,0x99, - 0xb8,0xec,0x93,0xd3,0xfe,0xaf,0xeb,0xb7,0xc3,0x9e,0x3b,0xe3,0x9b,0x13,0x7f,0x6f, - 0x7c,0x7b,0x01,0x9f,0x39,0xf3,0x07,0x09,0x5f,0xbb,0xf3,0xcf,0xe3,0x1e,0xbc,0xf4, - 0x5b,0x6a,0xff,0x5d,0x7d,0xd7,0x63,0x1f,0x3d,0xef,0x8b,0x53,0xdd,0x7b,0x80,0x8c, - 0x64,0x99,0x3c,0xf9,0xe3,0x6f,0x52,0x79,0x84,0x94,0x54,0x99,0xbd,0xf8,0xb3,0xcb, - 0x7f,0x9c,0xf9,0x76,0x51,0x14,0x3b,0xf7,0x0a,0xa8,0x5e,0xbf,0x52,0x9d,0xc0,0x1f, - 0x3e,0xe5,0xed,0x4e,0x80,0xe5,0xab,0x10,0x5b,0x00,0x18,0x3a,0xfd,0x9d,0x49,0x81, - 0xdf,0x0a,0xca,0x59,0x10,0x98,0x3a,0xea,0xbd,0x8a,0x7e,0xd5,0x33,0xe0,0x01,0x21, - 0x98,0x37,0x09,0x4e,0x49,0x83,0xef,0xb2,0xe0,0x05,0xd1,0x17,0x3f,0x02,0xae,0x4f, - 0x67,0xa5,0x2b,0x91,0x58,0x9a,0x94,0x3e,0xf6,0x2d,0x8f,0x82,0xc5,0x0b,0x51,0x06, - 0x31,0x78,0x42,0x0e,0x6e,0x8f,0x85,0xcd,0x8b,0xd1,0x0b,0x41,0x18,0x40,0xf5,0xcd, - 0x4f,0x84,0x85,0xb3,0x61,0x0c,0x3b,0x92,0x3f,0x1a,0x4e,0x8f,0x81,0xdb,0x4a,0x51, - 0x02,0x61,0xf8,0x40,0x19,0x7e,0x49,0x89,0xe3,0xaa,0xd1,0x11,0x91,0xf8,0x3f,0xfe, - 0x41,0x40,0x8a,0x2d,0x64,0x49,0xfe,0x08,0x71,0xf8,0x44,0x1d,0x0e,0x4f,0x88,0xe7, - 0xb2,0xe2,0x15,0xb1,0x18,0x41,0x22,0xce,0x49,0x8c,0xef,0xc8,0x51,0x0a,0xf1,0x77, - 0x3e,0x85,0x34,0x11,0x85,0x67,0x84,0xde,0xe7,0x46,0x75,0xad,0x24,0xb5,0xd1,0x8d, - 0xa7,0x03,0x55,0x19,0xd9,0x38,0x47,0xf0,0xd5,0xd1,0x54,0xd3,0x82,0x62,0x12,0x7b, - 0xf4,0x46,0x7c,0xdc,0x11,0x8c,0x39,0x04,0x62,0x20,0x05,0x39,0x33,0x3a,0x7e,0xd1, - 0x90,0x7b,0x44,0xe4,0x18,0x14,0xb9,0x48,0x3f,0x36,0x4d,0x1e,0x89,0x84,0x1c,0x31, - 0x7c,0x78,0x19,0x98,0x4d,0x08,0x79,0x97,0xc4,0xe4,0xd9,0x10,0xb6,0x20,0x4e,0x76, - 0xd2,0x89,0x8d,0x74,0x64,0x28,0x01,0x47,0x14,0x23,0x96,0xb2,0x53,0x8f,0x44,0xdb, - 0x28,0x49,0x39,0x19,0x4d,0x0e,0x0d,0x58,0xd2,0xb8,0xc9,0x21,0x35,0xd5,0x4a,0x92, - 0x31,0xc3,0x96,0x8f,0x93,0xe5,0xd2,0x68,0xa9,0x13,0x13,0xae,0x92,0x8f,0xcb,0x62, - 0xd9,0x2e,0x79,0x39,0x4c,0x3b,0x16,0x13,0x94,0xc7,0x14,0x66,0x2c,0x99,0xb9,0x49, - 0x68,0xa6,0x12,0x99,0xcf,0x84,0xd8,0xaf,0x7c,0xf9,0x4a,0x55,0x56,0x93,0x5e,0xa7, - 0xc4,0x57,0x4d,0x3a,0x94,0xcc,0x6a,0xf4,0x11,0x97,0xe0,0xf0,0x60,0x26,0xa5,0xf9, - 0x4b,0x72,0x96,0x13,0x9c,0xdb,0xf4,0xe6,0xce,0x4c,0xa9,0x0d,0x07,0xf6,0x12,0x9d, - 0xd7,0x84,0x67,0x3c,0xcd,0xf9,0x49,0x6b,0x8e,0x88,0x95,0xe7,0x70,0x5f,0x38,0xe1, - 0xd8,0x4d,0x71,0x9a,0x44,0x9e,0xff,0x54,0x63,0x2e,0x9d,0x41,0x8f,0x06,0x15,0x14, - 0xa1,0x95,0x4c,0x55,0x42,0xfe,0xfd,0xd9,0x4e,0x4a,0x1e,0x14,0x22,0x21,0x81,0xe8, - 0x39,0xf5,0x39,0x35,0x64,0x70,0x44,0xa1,0x11,0x55,0xe7,0x3b,0x29,0x5a,0x51,0x8b, - 0xe6,0x93,0x9b,0x1f,0xad,0xc8,0x46,0x39,0x7a,0x51,0x92,0x46,0xd3,0xa4,0x27,0x15, - 0xe9,0xd3,0x30,0x3a,0x38,0x56,0x01,0xc4,0x7e,0x29,0x75,0xe7,0x4a,0x73,0x61,0x10, - 0x9a,0x8e,0xd4,0xa6,0xb3,0xfc,0x48,0x4e,0x0b,0x34,0x4f,0x95,0xde,0x34,0x16,0x0b, - 0x81,0xca,0x2d,0xf9,0xb9,0x4c,0xa2,0x16,0x55,0xa7,0x2f,0xe5,0x69,0x4f,0x55,0x21, - 0x11,0xa3,0x1e,0x55,0x99,0x49,0x4d,0x49,0x54,0x99,0xda,0x54,0x8f,0x96,0x54,0x14, - 0x1e,0xd2,0xc8,0x54,0x05,0xda,0xd0,0x50,0xb8,0xc8,0xa7,0x41,0xd5,0xea,0x56,0x35, - 0xa1,0x23,0xa5,0x7e,0x95,0xa1,0xe3,0x74,0x89,0x90,0xa0,0xfa,0x3a,0x89,0x86,0x15, - 0x13,0x4e,0xb2,0xea,0x5a,0x35,0x1a,0x47,0xb7,0xd6,0x95,0xab,0xbf,0x33,0xeb,0x59, - 0x59,0xd1,0x30,0xb1,0xf6,0xd5,0x9e,0x01,0xbd,0x44,0xbf,0x04,0x1b,0x57,0x62,0xb6, - 0x15,0x27,0x87,0x45,0xeb,0xf1,0xa8,0x3a,0xd7,0x9e,0x84,0xcc,0xb1,0x83,0x05,0x6b, - 0x5e,0x0d,0xdb,0x32,0xc0,0x3e,0xd6,0xa0,0x97,0x65,0xec,0x64,0xe9,0xfa,0x3d,0xb6, - 0x16,0x11,0xb3,0x99,0x7d,0xc4,0xfd,0x44,0xdb,0x59,0xd3,0xa6,0x0c,0x11,0xa7,0xc5, - 0xeb,0x0f,0x28,0x5b,0x5a,0xd6,0xb6,0x96,0xa5,0xaf,0x9d,0x49,0xc6,0xf6,0x10,0x17, - 0xd7,0xd6,0x16,0xb4,0xab,0x15,0xca,0xfb,0x40,0xba,0x46,0xcd,0xc6,0xf6,0x10,0x1f, - 0xd4,0x45,0x0d,0x55,0xfe,0x3b,0x5c,0xe2,0x16,0x97,0xac,0xdd,0xf3,0xec,0x67,0x49, - 0x9b,0x5b,0x9c,0x1e,0x17,0xb9,0x8d,0xe5,0xed,0x72,0xed,0xda,0x41,0xe8,0x16,0x0c, - 0xb6,0xd1,0x25,0x49,0x05,0x9d,0x1b,0x58,0xee,0x76,0x77,0x14,0x3d,0xd4,0xae,0x94, - 0x10,0xfb,0x47,0xf4,0x56,0xd1,0xba,0xe7,0x55,0x6f,0x14,0xdd,0x3b,0x5d,0xe1,0xee, - 0x55,0xaf,0x61,0x34,0xef,0x7a,0x6d,0x3b,0x5f,0xfa,0xd6,0x97,0xba,0xe5,0xc5,0xef, - 0x5b,0xc9,0x9b,0x47,0xdc,0x96,0x50,0xbc,0x63,0xc5,0x6e,0x21,0xf9,0xd0,0x35,0x03, - 0xab,0xc8,0xbb,0x31,0xf3,0xc3,0xd7,0xe0,0x6a,0x22,0x59,0x64,0x93,0x17,0x57,0x93, - 0xb0,0x86,0x98,0xdb,0x0b,0xa6,0x64,0xd5,0xa5,0x2d,0x65,0xf0,0x34,0xad,0xb2,0x53, - 0x82,0xfe,0x14,0xc3,0x1f,0xde,0x42,0x59,0x39,0xfc,0x50,0xe9,0xde,0x13,0x0b,0x89, - 0x45,0x69,0x87,0x2d,0xbc,0x4e,0x2b,0x54,0x16,0xc5,0x03,0xf5,0x6a,0x8c,0x9b,0x30, - 0x63,0x11,0x87,0x54,0xa6,0x37,0x56,0x4b,0x8b,0xf1,0x39,0x0f,0xdd,0x7e,0x53,0xc6, - 0x3f,0x66,0x67,0x8a,0x85,0xd1,0xcf,0xb2,0x14,0x99,0x9a,0x47,0x46,0x32,0x4c,0x94, - 0x7c,0x57,0x33,0xee,0x18,0xb8,0x43,0xc6,0xf1,0x92,0x9d,0x59,0x63,0x87,0xf6,0x58, - 0x12,0x57,0xf6,0xe4,0x4a,0x00,0x1a,0x4c,0x22,0x47,0xb9,0x48,0x41,0x86,0x6c,0x2d, - 0xa1,0x7c,0x62,0x2c,0x27,0xd9,0xcc,0xcd,0xb4,0xf2,0x98,0xf1,0xb8,0x66,0x36,0xff, - 0x04,0xcd,0x0b,0x95,0xe4,0x9c,0x91,0x1a,0x66,0x37,0xa7,0xd9,0xcb,0x55,0x56,0x6c, - 0x9e,0x7d,0xfc,0xfe,0x66,0x3b,0xe7,0x4c,0xae,0x7d,0xe6,0x72,0xa0,0xd1,0x18,0x67, - 0xc2,0xde,0x59,0xcf,0x75,0x46,0xf4,0x8a,0x9d,0x5a,0x62,0x43,0xef,0x59,0xca,0x8f, - 0x86,0xf4,0x84,0x95,0x90,0x63,0x58,0xfe,0xd9,0xd2,0x83,0x16,0xf3,0xa4,0xc9,0x5c, - 0x69,0xa1,0x2e,0x1a,0xd0,0x9f,0x96,0xe3,0xa6,0x45,0x1d,0x69,0x4c,0x77,0xd9,0xd4, - 0x6d,0xc6,0xe6,0xa5,0xa3,0x71,0x68,0x4b,0x9e,0x19,0x98,0xa1,0x56,0x75,0xac,0x51, - 0x39,0x6a,0x5d,0x16,0xda,0xd6,0xa5,0x16,0xf4,0x7e,0x75,0x7d,0x6a,0x58,0xf7,0x9a, - 0x90,0x0d,0x86,0xdb,0xae,0x85,0xdd,0x68,0xd4,0x65,0x58,0xd6,0xc7,0x7e,0xcb,0xaa, - 0x89,0x1d,0x60,0x98,0x16,0x5b,0xd2,0xc9,0x76,0xe5,0xb4,0xad,0x3d,0x6b,0x46,0x77, - 0x94,0x91,0x9d,0x16,0x65,0xb3,0x8f,0x90,0x69,0x38,0x47,0xdb,0x98,0xc1,0x76,0xf6, - 0xad,0x69,0x1d,0x44,0x3d,0x96,0x1b,0xdc,0xcf,0x56,0xf7,0x81,0x71,0xfd,0x6d,0x23, - 0x84,0x1b,0xda,0x37,0x74,0x74,0xbc,0x79,0x30,0x6f,0x7b,0xbf,0x9b,0xd9,0xeb,0x96, - 0x77,0xbb,0xf9,0xfd,0x6b,0x7d,0x67,0x9b,0xd4,0xd5,0x26,0x77,0xc0,0x05,0xde,0x6a, - 0x6a,0x6f,0x1b,0x92,0xef,0x05,0xe4,0x96,0x79,0x5d,0x70,0x7a,0x8e,0x17,0xd4,0xb5, - 0x46,0xf6,0xc2,0xbd,0xfd,0x43,0x4a,0xdf,0x5b,0x6d,0xe7,0x96,0xf6,0x66,0x35,0xde, - 0x6f,0x7c,0xff,0xdb,0xd8,0xe9,0xf5,0xe2,0xc3,0x2d,0x5e,0x53,0x84,0xff,0x56,0xcd, - 0x03,0x57,0x78,0xca,0xdd,0x3d,0x71,0x4d,0x87,0x9c,0xe3,0xc3,0x26,0xf9,0xca,0x5d, - 0x78,0x72,0xfe,0x73,0xd7,0x1c,0xdd,0x31,0xf7,0xdf,0xab,0x75,0x1e,0x71,0x42,0xdf, - 0xdc,0x78,0x59,0x44,0x79,0x88,0x01,0x9e,0x46,0xcf,0xd5,0x1b,0xe2,0x17,0xb7,0x79, - 0x68,0x0d,0xd7,0x70,0x82,0x37,0x1d,0x6f,0x1f,0xb7,0xdb,0xd3,0x99,0xfe,0x72,0x65, - 0x57,0xdd,0x6c,0x49,0xd7,0x76,0xd6,0xb1,0x3d,0xf2,0xe0,0x5c,0xdd,0xe8,0x1b,0xd6, - 0x7a,0xc7,0x1d,0x17,0x76,0x2e,0x4e,0xd2,0xec,0x41,0x57,0x7a,0xdb,0x5f,0x90,0x6f, - 0x9e,0xa7,0xdd,0x6b,0x65,0x07,0xfa,0xd4,0x5d,0x7d,0x74,0xd8,0xbc,0x1d,0x31,0x73, - 0x17,0xfa,0xce,0x41,0xf3,0x75,0x7f,0x9f,0xdd,0xb2,0x7d,0xc7,0x4c,0xde,0xd9,0x3d, - 0x78,0x30,0xdf,0x1d,0x37,0x75,0x47,0xfc,0xdf,0xfd,0x1e,0x78,0x83,0x3d,0x58,0xea, - 0x91,0x97,0xf8,0xe4,0xd5,0x95,0x60,0xaf,0x1f,0x1e,0xef,0x99,0xe7,0x4f,0xe7,0x5d, - 0xbe,0x79,0xcb,0xaf,0xdd,0x58,0x03,0x26,0xfb,0xdd,0x9c,0x5e,0x61,0x65,0x95,0xde, - 0xee,0x95,0xe7,0x74,0xfb,0x7c,0xd5,0x39,0x4f,0xef,0x9d,0xca,0xa7,0xc7,0x50,0xec, - 0x35,0xdf,0x78,0x8f,0xf7,0x57,0x56,0xad,0xc3,0x7a,0xe8,0x5d,0xdf,0x7b,0x5d,0xed, - 0x9e,0xf5,0xbf,0xf7,0xeb,0xeb,0x85,0xff,0x5d,0xdf,0xe7,0x1e,0xf8,0xfd,0xe3,0xd1, - 0xf0,0x1d,0x3f,0x7b,0x1e,0xa7,0x1e,0x48,0xcd,0x07,0xfd,0xf2,0x8d,0x5f,0x40,0xea, - 0xdf,0x57,0xf9,0xb5,0x17,0xfd,0xf6,0x91,0x94,0x7c,0xd3,0x4f,0xdf,0xfb,0xf1,0x05, - 0x7f,0xf9,0x05,0xff,0x78,0xc5,0x67,0x9f,0x4a,0xe7,0x17,0x79,0xe2,0x6d,0x3c,0x7a, - 0xf6,0xfe,0x67,0xd7,0xfa,0xdd,0x67,0x7e,0x73,0xd9,0x34,0x7f,0xee,0x8f,0x1f,0xd5, - 0xdf,0x57,0xd9,0x02,0x29,0x1c,0x5c,0xfa,0x77,0x79,0xfc,0xd7,0x7e,0x4e,0x33,0x44, - 0x51,0x71,0x7f,0x02,0xf8,0x79,0x04,0x98,0x80,0x86,0x37,0x45,0x08,0xb8,0x5b,0xb8, - 0x57,0x7f,0x8a,0x56,0x80,0x74,0x77,0x80,0x5b,0x11,0x80,0xe2,0x37,0x80,0x90,0x57, - 0x81,0x16,0xb8,0x41,0x89,0x10,0x81,0x94,0x57,0x7c,0x9c,0xf5,0x7c,0x0e,0x38,0x3a, - 0x5c,0x90,0x81,0xc4,0x77,0x7d,0xea,0x97,0x7f,0xa8,0x11,0x53,0x26,0xd6,0x40,0xf4, - 0xb7,0x7f,0x14,0x98,0x82,0x1e,0xf3,0x82,0xca,0x10,0x83,0x0a,0x18,0x7f,0x72,0xd6, - 0x80,0x22,0x93,0x51,0x2c,0x96,0x83,0x1a,0xb8,0x80,0x34,0x38,0x5a,0x12,0xb3,0x4f, - 0x60,0x51,0x84,0x32,0xb8,0x81,0x7e,0xd6,0x45,0x92,0x77,0x84,0x40,0x98,0x5a,0x42, - 0xb8,0x83,0x2c,0x18,0x84,0x02,0x93,0x4e,0x74,0x16,0x59,0xd0,0xb7,0x78,0x42,0xd6, - 0x83,0x56,0x58,0x4f,0x38,0x38,0x48,0x22,0xb8,0x82,0x5c,0x58,0x83,0x5e,0xf8,0x85, - 0x58,0x58,0x55,0x52,0x78,0x7c,0x54,0x18,0x86,0xf2,0x32,0x54,0x4a,0x78,0x86,0x70, - 0x38,0x85,0xa8,0x15,0x82,0xfa,0xf2,0x86,0x72,0x78,0x83,0x3a,0xb8,0x86,0x24,0x98, - 0x84,0xfe,0xf2,0x54,0x78,0xb8,0x36,0x62,0x38,0x81,0x6c,0x58,0x58,0xf6,0x72,0x87, - 0x6a,0x18,0x88,0x80,0x78,0x7b,0xd8,0xf7,0x57,0x76,0xd8,0x88,0x5a,0x58,0x88,0x88, - 0xb8,0x88,0x44,0xf8,0x87,0x86,0x78,0x88,0x2a,0x78,0x85,0x8a,0xb8,0x7e,0x3c,0x58, - 0xfe,0x89,0x96,0x78,0x89,0xe8,0x97,0x86,0x98,0x38,0x83,0x9c,0x18,0x87,0x98,0x17, - 0x89,0x92,0x78,0x82,0x9a,0x18,0x7c,0x4c,0xf8,0x89,0x7e,0xd8,0x8a,0x34,0x17,0x8a, - 0x90,0x38,0x82,0x5a,0xf6,0x88,0xe8,0x91,0x85,0xa0,0x78,0x8a,0xb2,0x38,0x86,0xb4, - 0xd8,0x89,0xa6,0x98,0x8b,0xb8,0x58,0x8b,0xb0,0xb8,0x85,0xbc,0xf8,0x84,0x08,0x72, - 0x8b,0xee,0x37,0x51,0xa8,0xb8,0x8a,0x94,0xf8,0x80,0xb6,0x97,0x8c,0xa2,0x58,0x8c, - 0x7a,0xb8,0x7a,0x8c,0x38,0x41,0xae,0x72,0x8c,0xc2,0xf8,0x8a,0x4c,0x34,0x8d,0xd4, - 0x38,0x43,0xce,0xf8,0x8c,0xba,0x58,0x8a,0xca,0x58,0x82,0xdc,0xb8,0x26,0x28,0xb2, - 0x58,0xe2,0xd8,0x8c,0x12,0x38,0x8a,0xf6,0x47,0x23,0xe7,0x08,0x8d,0x79,0x88,0x8e, - 0xe1,0x67,0x70,0xe5,0x08,0x23,0xee,0x08,0x8e,0xd1,0x18,0x8f,0xfd,0xb7,0x2a,0xf0, - 0xf7,0x8b,0xc8,0xd8,0x8f,0xd8,0x38,0x8b,0xfb,0xa8,0x60,0xd9,0x48,0x46,0xe9,0x28, - 0x88,0xeb,0x28,0x90,0x30,0x16,0x8b,0xc0,0xd8,0x8b,0xfe,0x38,0x8c,0x09,0x09,0x5f, - 0x0d,0x09,0x90,0x99,0x28,0x8d,0x93,0x08,0x91,0xc6,0x75,0x8d,0x54,0x84,0x8f,0xef, - 0x38,0x87,0x17,0x09,0x60,0xdf,0xc8,0x90,0x14,0x99,0x8f,0x1d,0xe8,0x91,0xfa,0x15, - 0x8c,0x1a,0xf9,0x83,0x15,0xb9,0x89,0x25,0x39,0x90,0x12,0x89,0x92,0xf0,0xc8,0x91, - 0x7b,0xc8,0x92,0x11,0x29,0x92,0x31,0x39,0x40,0xaa,0x38,0x8e,0x33,0x69,0x92,0x04, - 0xa9,0x76,0x2b,0x74,0x90,0x4b,0xa8,0x93,0x7c,0x05,0x92,0x0e,0xc9,0x93,0x3c,0xfe, - 0x14,0x90,0x41,0xc9,0x5f,0x27,0xa9,0x8d,0xa9,0xa8,0x92,0xcb,0x88,0x94,0x04,0xe6, - 0x92,0x4b,0x39,0x42,0x36,0x69,0x91,0x4f,0x49,0x93,0xe1,0x48,0x95,0x53,0x79,0x8f, - 0x40,0x69,0x95,0xec,0xa5,0x94,0x05,0x59,0x8d,0x38,0x59,0x7d,0x5d,0xb9,0x93,0x51, - 0x09,0x96,0x1f,0xa8,0x8e,0x5c,0x49,0x96,0xf2,0xf5,0x95,0x3d,0x79,0x93,0x23,0x49, - 0x92,0x6b,0x49,0x0b,0x19,0x29,0x95,0x5b,0xf4,0x93,0x6a,0x29,0x97,0xb2,0x35,0x94, - 0x13,0xb9,0x91,0x5b,0x89,0x97,0x79,0xe9,0x5b,0x7b,0xf9,0x92,0x3e,0x29,0x96,0x63, - 0x09,0x98,0x6c,0x59,0x94,0x46,0xd9,0x97,0x21,0xb9,0x8b,0x87,0x29,0x60,0x82,0x39, - 0x98,0x5a,0xe9,0x97,0x43,0xe8,0x98,0x7a,0xb9,0x90,0x8c,0x99,0x88,0x85,0x29,0x8f, - 0x95,0x19,0x98,0x90,0x59,0x97,0xdd,0x98,0x96,0x7f,0xc9,0x99,0x1a,0x46,0x97,0x9f, - 0xb9,0x44,0x50,0xf8,0x7e,0xa3,0x89,0x84,0xa5,0x69,0x9a,0xf4,0x28,0x7b,0xe9,0xa7, - 0x9a,0x68,0xd0,0x86,0xa1,0x89,0x96,0x68,0xf8,0x90,0xb1,0x09,0x62,0x9e,0xc9,0x97, - 0x61,0xf9,0x9a,0xd1,0x87,0x9b,0xb4,0x09,0x93,0xaa,0x48,0x06,0x63,0xf7,0x9b,0x8f, - 0xc9,0x9a,0x44,0x09,0x9a,0xa8,0x59,0x78,0xc5,0x09,0x83,0xf6,0xd8,0x9b,0xae,0xd9, - 0x9c,0x71,0xc7,0x9c,0x10,0xe8,0x9c,0x4e,0xb6,0x75,0xd3,0x29,0x07,0x7d,0x48,0x8c, - 0xa9,0x89,0x9d,0x70,0x59,0x9b,0x7c,0xc8,0x9d,0xdd,0x39,0x99,0x8b,0x29,0x7d,0xd2, - 0x29,0x9e,0x18,0x18,0x85,0xd6,0x49,0x9c,0xe7,0x99,0x9b,0xb3,0xa9,0x9e,0xfe,0xd7, - 0xc9,0x9e,0x20,0xa8,0x9d,0xe5,0x09,0x9f,0xf1,0x39,0x9c,0x75,0x48,0x5b,0xeb,0x69, - 0x9f,0x28,0x88,0x9f,0xfc,0xa8,0x9f,0xfb,0xb9,0x9a,0x55,0xa8,0x90,0xb3,0x05,0xa0, - 0xe8,0x29,0xa0,0x6a,0x35,0x74,0x05,0x6a,0xa0,0x07,0xda,0x92,0xf5,0xa9,0xa0,0xb6, - 0xe9,0x9e,0x10,0x76,0x5d,0x0f,0x1a,0xa0,0x65,0x78,0x95,0xe6,0x49,0xa1,0x9a,0x99, - 0x99,0x0d,0xfa,0x9f,0x19,0xaa,0xa1,0x1b,0x7a,0xa1,0x0e,0xea,0xa1,0x4d,0x69,0x96, - 0x96,0x59,0x72,0x23,0x0a,0xa1,0x0c,0x9a,0x94,0x51,0x87,0xa2,0x29,0xaa,0xa2,0xca, - 0x55,0x74,0x2d,0xfa,0xa1,0xe4,0xd9,0x99,0x07,0x27,0xa3,0xde,0x49,0xa3,0x47,0x11, - 0x49,0x37,0x3a,0x9e,0xe9,0x39,0x97,0xe3,0xc6,0xa3,0x67,0xf9,0x8f,0xd9,0x79,0x6d, - 0x41,0x9a,0x95,0x3e,0x4a,0xa4,0xcb,0x66,0xa4,0x77,0xd9,0x84,0x3a,0xaa,0xa4,0x4b, - 0x4a,0xa2,0xf3,0xd9,0x9e,0x4f,0x0a,0xa5,0x47,0x6a,0xa1,0x15,0xda,0x6d,0x55,0xda, - 0xa3,0xfa,0xa8,0x9c,0xa9,0xa6,0xa5,0x91,0x99,0x93,0x38,0xda,0xa1,0x5f,0x4a,0x42, - 0xb7,0xa9,0x45,0x09,0x47,0xa6,0xad,0xb9,0x99,0x42,0xba,0x74,0x69,0xea,0x96,0xa2, - 0xb9,0x02,0xff,0xe0,0xa6,0x98,0xa9,0x24,0x73,0x8a,0x9c,0x11,0x63,0xa7,0x60,0x6a, - 0x23,0x79,0xaa,0xa7,0x32,0xc2,0xa7,0x6a,0x7a,0x61,0x7f,0xfa,0xa6,0x7e,0x2a,0xa8, - 0x8a,0xd9,0x5e,0x85,0xaa,0x42,0xc9,0x85,0xa8,0x6a,0x70,0x5b,0x82,0x5a,0x31,0x88, - 0xfa,0xa8,0x85,0x1a,0xa9,0x8e,0xda,0xa8,0x7f,0x3a,0xa9,0x96,0x5a,0xca,0xa9,0x7c, - 0x7a,0xa9,0x9a,0x9a,0xa9,0x79,0xba,0xa9,0x9e,0xda,0xa9,0x76,0xfa,0xa9,0xa2,0x1a, - 0xaa,0x73,0x3a,0xaa,0xa6,0x5a,0xaa,0x6e,0x7a,0xaa,0xaa,0x9a,0xaa,0x69,0xba,0xaa, - 0xae,0xda,0xaa,0x64,0xfa,0xaa,0xb2,0x1a,0xab,0x5f,0x3a,0xab,0xb6,0x5a,0xab,0x5a, - 0x5a,0x60,0x8b,0x4a,0x9a,0xca,0xc1,0xab,0x92,0x65,0x1b,0xbf,0x0a,0x5e,0x9a,0x21, - 0xac,0x5e,0xe9,0x18,0xc5,0x0a,0x95,0x75,0x81,0xac,0x65,0xb9,0x16,0xcb,0xca,0xac, - 0x66,0xe1,0xac,0xcf,0x7a,0x15,0xd1,0x1a,0xa2,0x48,0x41,0xad,0xd2,0x6a,0xad,0xd7, - 0x8a,0xad,0x3e,0xa1,0xad,0xdb,0x4a,0x13,0xdd,0xea,0xad,0x2f,0x01,0xae,0xe1,0x5a, - 0x12,0xe3,0x9a,0xac,0x43,0x61,0xae,0xfe,0xc5,0x15,0xe9,0x6a,0xac,0x4d,0xc1,0xae, - 0xf6,0xe5,0xae,0xef,0x8a,0x98,0xf1,0x2a,0xaf,0x26,0x1a,0x16,0xf5,0x6a,0xaf,0xeb, - 0x8a,0xaf,0x35,0x7a,0xaf,0xfb,0xfa,0xa3,0x70,0xe1,0xaf,0x4e,0x0a,0xb0,0x01,0xdb, - 0xab,0x7a,0x41,0xb0,0x00,0x48,0x18,0x07,0x4b,0x9d,0x89,0xa1,0xb0,0x53,0xca,0xb0, - 0x0d,0xcb,0x9f,0xa2,0x01,0xb1,0x58,0xea,0x19,0x13,0x0b,0x9c,0x0f,0x6b,0xb1,0x74, - 0x6a,0x27,0x1b,0xcb,0xb1,0x76,0x50,0x00,0x00,0x3b + 0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0x00, 0x02, 0x00, 0x02, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x21, 0xfe, 0x11, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69, + 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x00, 0x21, 0xf9, 0x04, 0x01, 0x0a, 0x00, 0x01, 0x00, + 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0xfe, 0x8c, 0x8f, 0xa9, 0xcb, + 0xed, 0x0f, 0xa3, 0x9c, 0xb4, 0xda, 0x8b, 0xb3, 0xde, 0xbc, 0xfb, 0x0f, 0x86, 0xe2, 0x48, 0x96, + 0xe6, 0x01, 0xa4, 0xea, 0xca, 0xb6, 0xee, 0x0b, 0xc7, 0xf2, 0x4c, 0xd7, 0xf6, 0x8d, 0xe7, 0xfa, + 0x0e, 0x9c, 0xfe, 0x0f, 0x0c, 0x0a, 0x87, 0x22, 0x9e, 0xf1, 0x88, 0x4c, 0x2a, 0x97, 0xcc, 0x24, + 0xf1, 0x09, 0x8d, 0x4a, 0xa7, 0x98, 0xa6, 0xf5, 0x8a, 0xcd, 0x6a, 0xb7, 0x2c, 0xaa, 0xf7, 0x0b, + 0x0e, 0x17, 0xb9, 0xe4, 0xb2, 0xf9, 0x8c, 0x56, 0x89, 0xd7, 0xec, 0xb6, 0x3b, 0x0d, 0x8f, 0xcb, + 0xe7, 0x3a, 0xb7, 0xfd, 0x8e, 0xf7, 0xd1, 0xf7, 0xfc, 0x7e, 0x3f, 0x0f, 0x18, 0x28, 0x48, 0xe1, + 0x57, 0x68, 0x78, 0x68, 0x36, 0xa8, 0xb8, 0x18, 0x88, 0xe8, 0xf8, 0x08, 0xb9, 0xc4, 0x38, 0x49, + 0x09, 0x16, 0x79, 0x89, 0x99, 0x49, 0x53, 0xc9, 0xd9, 0x19, 0xa4, 0x09, 0x1a, 0x2a, 0xda, 0xe3, + 0x59, 0x6a, 0xda, 0x31, 0x9a, 0xaa, 0x0a, 0x79, 0xda, 0xea, 0x3a, 0xb1, 0x1a, 0x2b, 0x5b, 0xf8, + 0x5a, 0x6b, 0x6b, 0x30, 0x9b, 0xab, 0x3b, 0x77, 0xdb, 0x6b, 0xba, 0x0b, 0x1c, 0x7c, 0xe6, 0x4b, + 0x3c, 0x29, 0x7c, 0x8c, 0x9c, 0x55, 0xbc, 0xdc, 0x98, 0xec, 0xfc, 0xec, 0xc4, 0x2c, 0xdd, 0x06, + 0x5d, 0x6d, 0x5d, 0x37, 0x9d, 0xfd, 0x75, 0xcd, 0xdd, 0x3d, 0xa3, 0x0d, 0x1e, 0xe5, 0x3d, 0x4e, + 0xde, 0x15, 0x7e, 0x0e, 0x54, 0xae, 0x5e, 0x8e, 0xde, 0x5e, 0xb2, 0x0e, 0x3f, 0xee, 0x3e, 0xff, + 0x11, 0x6f, 0xdf, 0x4d, 0x9f, 0x9f, 0x71, 0xcf, 0x7f, 0xad, 0xff, 0x0f, 0xab, 0x9f, 0x40, 0x68, + 0x00, 0x0b, 0x36, 0x18, 0x88, 0xf0, 0x99, 0xc1, 0x85, 0x08, 0x12, 0x3a, 0x3c, 0xc6, 0x90, 0xe1, + 0xc3, 0x89, 0xc1, 0x22, 0x16, 0xa4, 0x88, 0x71, 0x97, 0x45, 0xfe, 0x7d, 0x19, 0x3b, 0xce, 0xda, + 0x98, 0xcf, 0xa3, 0xc8, 0x55, 0x20, 0xdd, 0x8d, 0x3c, 0x99, 0xaa, 0x24, 0x3a, 0x94, 0x2c, 0x41, + 0xa9, 0x0c, 0xd7, 0x32, 0x66, 0xa6, 0x97, 0xd9, 0x64, 0xda, 0x8c, 0x44, 0x73, 0xda, 0xcd, 0x9d, + 0x8e, 0x72, 0x2e, 0xe3, 0x09, 0xd4, 0x90, 0xcf, 0x62, 0x41, 0x8b, 0xfe, 0x19, 0x7a, 0xcb, 0xa8, + 0x52, 0x3a, 0x48, 0x93, 0x2e, 0x7d, 0x0a, 0xa7, 0x69, 0x2d, 0xa8, 0x54, 0x87, 0x49, 0x6d, 0x55, + 0x35, 0x6b, 0x99, 0xab, 0xa7, 0xb4, 0x7a, 0xd5, 0xc2, 0xb5, 0xd4, 0xd7, 0xb1, 0x57, 0xc2, 0x7a, + 0x22, 0x8b, 0x96, 0x89, 0x59, 0x4e, 0x69, 0xdb, 0x22, 0x59, 0x5b, 0xc9, 0xad, 0xdc, 0x1d, 0x70, + 0x8d, 0xcd, 0xbd, 0x8b, 0xa3, 0xee, 0x22, 0xbc, 0x7c, 0x6b, 0xe8, 0x55, 0xd4, 0x37, 0x70, 0x8c, + 0xbf, 0x82, 0x04, 0x1b, 0x76, 0x41, 0xb8, 0xd9, 0xe1, 0xc5, 0x29, 0x12, 0xe7, 0x61, 0x0c, 0xd9, + 0x31, 0x1e, 0xc8, 0x8c, 0x25, 0xdf, 0xa1, 0xbc, 0xd8, 0xb2, 0x1d, 0xcc, 0x87, 0x35, 0x53, 0xe3, + 0x6c, 0xd8, 0x33, 0x1b, 0xd0, 0x9d, 0x45, 0x87, 0x21, 0x1d, 0xda, 0xb4, 0x25, 0xd4, 0x81, 0x55, + 0xaf, 0x66, 0xcd, 0xd7, 0xf5, 0x36, 0xd8, 0xb1, 0x65, 0x53, 0xa1, 0x5d, 0xdb, 0xb6, 0x14, 0xdc, + 0x78, 0x75, 0x4f, 0xe1, 0x7d, 0xd7, 0xf7, 0x6e, 0xe0, 0x72, 0x85, 0x8b, 0x23, 0xee, 0xd6, 0x38, + 0x14, 0xe4, 0xc9, 0x95, 0x13, 0x61, 0xde, 0xd6, 0xf9, 0x73, 0xe8, 0x68, 0xa5, 0x0f, 0xa1, 0x5e, + 0xdd, 0xfa, 0x27, 0xec, 0x63, 0xb5, 0x6f, 0xe7, 0xee, 0xd5, 0x7b, 0x3a, 0xf0, 0xe1, 0xc5, 0xeb, + 0x21, 0xaf, 0xd5, 0xfc, 0x79, 0xf4, 0x55, 0xd5, 0x9f, 0x60, 0x9f, 0xd5, 0xbd, 0x09, 0xf8, 0xed, + 0xe5, 0x93, 0xa0, 0x4f, 0xd5, 0xfe, 0x7d, 0xfc, 0x4f, 0xfe, 0xf5, 0x8f, 0xe0, 0xdf, 0x9f, 0x7f, + 0x21, 0x00, 0xb8, 0x94, 0x80, 0x03, 0x12, 0x68, 0x94, 0x81, 0x20, 0x20, 0x98, 0xa0, 0x82, 0x1e, + 0x30, 0x58, 0x94, 0x83, 0x0f, 0x42, 0x08, 0x94, 0x84, 0xa8, 0x50, 0xc8, 0x93, 0x85, 0x1c, 0x60, + 0x98, 0xa1, 0x86, 0x1a, 0x70, 0xb8, 0x93, 0x87, 0x1f, 0x82, 0x68, 0x93, 0x88, 0xfb, 0x90, 0x28, + 0x93, 0x89, 0x55, 0xa0, 0x18, 0x93, 0x8a, 0x17, 0xb0, 0xd8, 0xa2, 0x8b, 0x15, 0xc0, 0xd8, 0x92, + 0x8c, 0x33, 0xd2, 0x88, 0x92, 0x8d, 0x84, 0xe0, 0x78, 0x92, 0x8e, 0x01, 0xf1, 0x28, 0x92, 0x8f, + 0x12, 0x00, 0x39, 0x92, 0x90, 0x11, 0x10, 0x19, 0xa4, 0x91, 0x0f, 0x20, 0xe9, 0x91, 0x92, 0x4b, + 0x32, 0x99, 0x91, 0x93, 0x0e, 0x40, 0x19, 0xa5, 0x94, 0x0c, 0x50, 0x89, 0x91, 0x95, 0x57, 0x62, + 0x39, 0x91, 0x96, 0x0b, 0x70, 0xd9, 0xa5, 0x97, 0x09, 0x80, 0xf9, 0x90, 0x98, 0x63, 0x92, 0x99, + 0x90, 0x99, 0x0d, 0xa1, 0x89, 0x90, 0x9a, 0x28, 0xb0, 0x39, 0x90, 0x9b, 0xb8, 0xc0, 0x29, 0x90, + 0x9c, 0x01, 0xd0, 0x59, 0xa7, 0x9c, 0x78, 0xf6, 0x63, 0xe7, 0x9e, 0xfc, 0xf4, 0xe9, 0xa7, 0x3d, + 0x80, 0x06, 0x0a, 0xcf, 0xa0, 0x84, 0xaa, 0x63, 0xe8, 0xa1, 0xe4, 0x24, 0xaa, 0xa8, 0x37, 0x8c, + 0x36, 0xca, 0xcd, 0xa3, 0x90, 0x5a, 0x23, 0xe9, 0xa4, 0x04, 0xe9, 0x69, 0xa9, 0xa3, 0x98, 0x66, + 0x1a, 0xe9, 0xa6, 0x9c, 0x52, 0xea, 0xe9, 0xa7, 0x97, 0xba, 0x29, 0xaa, 0x3f, 0xa1, 0x96, 0x9a, + 0x4c, 0xa5, 0xa8, 0x02, 0xa3, 0x2a, 0x85, 0x4f, 0xc6, 0x79, 0x2a, 0x87, 0x3f, 0xfe, 0x19, 0x2b, + 0x84, 0x2f, 0xd2, 0x4a, 0x2a, 0x89, 0x27, 0x0a, 0x5a, 0x2b, 0x81, 0x1b, 0xdc, 0xd3, 0x2a, 0x7d, + 0x17, 0x16, 0xda, 0xab, 0xb0, 0xf5, 0x10, 0x9b, 0xfe, 0x2b, 0x83, 0x07, 0xae, 0x13, 0x2c, 0x78, + 0xff, 0x31, 0x5b, 0x2c, 0x79, 0xfb, 0x21, 0x1a, 0x2d, 0x77, 0xf3, 0x51, 0x9b, 0x2c, 0x7e, 0xef, + 0x61, 0xab, 0x26, 0x80, 0xeb, 0x2d, 0x5a, 0x2d, 0x72, 0xe3, 0xb1, 0x13, 0x2e, 0x70, 0x42, 0x70, + 0x6b, 0x26, 0x7c, 0xd7, 0x91, 0x9b, 0xad, 0xb5, 0xeb, 0x82, 0xdb, 0x2e, 0x75, 0xd3, 0xb1, 0xdb, + 0xad, 0xb3, 0xf3, 0xc2, 0x5b, 0x2f, 0x76, 0xcb, 0xa1, 0x2b, 0xa6, 0xbb, 0x4f, 0x40, 0x1b, 0x2f, + 0x6f, 0xc3, 0xf1, 0xeb, 0x25, 0x74, 0xbf, 0x01, 0x9c, 0xaf, 0xb9, 0x07, 0x13, 0xac, 0xa5, 0xb8, + 0x0b, 0x33, 0x6c, 0x25, 0x71, 0x5e, 0xc4, 0xd3, 0x6c, 0x65, 0xb7, 0x51, 0x5c, 0x6e, 0x69, 0x17, + 0x23, 0x9b, 0x30, 0x69, 0xaf, 0x71, 0x9c, 0x2e, 0x6b, 0xa7, 0xf1, 0x1a, 0x70, 0x64, 0x23, 0x63, + 0x5c, 0x72, 0x66, 0x27, 0xa3, 0xdc, 0xb1, 0xc9, 0x2b, 0x83, 0xec, 0x54, 0x0b, 0xcf, 0xca, 0xfc, + 0x06, 0x67, 0x6b, 0xf0, 0xe9, 0xcb, 0x37, 0xc7, 0xc2, 0xf0, 0x19, 0x65, 0xa3, 0xe1, 0x6a, 0x8b, + 0x5f, 0xc3, 0x0e, 0x76, 0xb3, 0xcb, 0x62, 0xe4, 0x19, 0xb4, 0x0d, 0x1b, 0x0a, 0xfd, 0xb2, 0x60, + 0x35, 0x03, 0xfd, 0x4a, 0x5e, 0xbb, 0x32, 0x3d, 0x9b, 0xc6, 0x3f, 0x43, 0x8d, 0x95, 0xd4, 0xb7, + 0xde, 0x70, 0xb4, 0xd5, 0x45, 0xe3, 0x3c, 0x95, 0xd6, 0x16, 0x60, 0x53, 0x75, 0x6b, 0x9b, 0x21, + 0xed, 0x0a, 0x5d, 0x5b, 0x73, 0xfd, 0x71, 0x6e, 0x3d, 0x83, 0x9d, 0x36, 0xd9, 0x37, 0x8a, 0xbd, + 0xb1, 0xdb, 0x6f, 0x63, 0xfd, 0x8b, 0xdc, 0x3b, 0xd2, 0xfd, 0xf0, 0x5c, 0x8f, 0xb5, 0x19, 0x76, + 0x0e, 0x2b, 0xf2, 0x3d, 0xb0, 0xdf, 0x7f, 0xc3, 0x1a, 0xb5, 0xde, 0xb3, 0x2a, 0xdd, 0x76, 0x74, + 0x80, 0xa4, 0x19, 0x38, 0xe1, 0x47, 0x0a, 0xfe, 0xde, 0x78, 0x76, 0x87, 0x23, 0x1e, 0x37, 0xe5, + 0x63, 0x6b, 0x3e, 0x71, 0x71, 0x8a, 0x61, 0x9e, 0x35, 0xe7, 0x7b, 0xb3, 0x5d, 0xb6, 0xe5, 0x97, + 0x83, 0xde, 0x95, 0xe2, 0x43, 0x8a, 0xde, 0x77, 0x77, 0x85, 0x39, 0x94, 0x34, 0xeb, 0xab, 0x4b, + 0xbe, 0x2f, 0x59, 0x80, 0x95, 0x19, 0x39, 0xe9, 0x73, 0xeb, 0x5e, 0x77, 0x79, 0x83, 0x84, 0x99, + 0xb8, 0xec, 0x93, 0xd3, 0xfe, 0xaf, 0xeb, 0xb7, 0xc3, 0x9e, 0x3b, 0xe3, 0x9b, 0x13, 0x7f, 0x6f, + 0x7c, 0x7b, 0x01, 0x9f, 0x39, 0xf3, 0x07, 0x09, 0x5f, 0xbb, 0xf3, 0xcf, 0xe3, 0x1e, 0xbc, 0xf4, + 0x5b, 0x6a, 0xff, 0x5d, 0x7d, 0xd7, 0x63, 0x1f, 0x3d, 0xef, 0x8b, 0x53, 0xdd, 0x7b, 0x80, 0x8c, + 0x64, 0x99, 0x3c, 0xf9, 0xe3, 0x6f, 0x52, 0x79, 0x84, 0x94, 0x54, 0x99, 0xbd, 0xf8, 0xb3, 0xcb, + 0x7f, 0x9c, 0xf9, 0x76, 0x51, 0x14, 0x3b, 0xf7, 0x0a, 0xa8, 0x5e, 0xbf, 0x52, 0x9d, 0xc0, 0x1f, + 0x3e, 0xe5, 0xed, 0x4e, 0x80, 0xe5, 0xab, 0x10, 0x5b, 0x00, 0x18, 0x3a, 0xfd, 0x9d, 0x49, 0x81, + 0xdf, 0x0a, 0xca, 0x59, 0x10, 0x98, 0x3a, 0xea, 0xbd, 0x8a, 0x7e, 0xd5, 0x33, 0xe0, 0x01, 0x21, + 0x98, 0x37, 0x09, 0x4e, 0x49, 0x83, 0xef, 0xb2, 0xe0, 0x05, 0xd1, 0x17, 0x3f, 0x02, 0xae, 0x4f, + 0x67, 0xa5, 0x2b, 0x91, 0x58, 0x9a, 0x94, 0x3e, 0xf6, 0x2d, 0x8f, 0x82, 0xc5, 0x0b, 0x51, 0x06, + 0x31, 0x78, 0x42, 0x0e, 0x6e, 0x8f, 0x85, 0xcd, 0x8b, 0xd1, 0x0b, 0x41, 0x18, 0x40, 0xf5, 0xcd, + 0x4f, 0x84, 0x85, 0xb3, 0x61, 0x0c, 0x3b, 0x92, 0x3f, 0x1a, 0x4e, 0x8f, 0x81, 0xdb, 0x4a, 0x51, + 0x02, 0x61, 0xf8, 0x40, 0x19, 0x7e, 0x49, 0x89, 0xe3, 0xaa, 0xd1, 0x11, 0x91, 0xf8, 0x3f, 0xfe, + 0x41, 0x40, 0x8a, 0x2d, 0x64, 0x49, 0xfe, 0x08, 0x71, 0xf8, 0x44, 0x1d, 0x0e, 0x4f, 0x88, 0xe7, + 0xb2, 0xe2, 0x15, 0xb1, 0x18, 0x41, 0x22, 0xce, 0x49, 0x8c, 0xef, 0xc8, 0x51, 0x0a, 0xf1, 0x77, + 0x3e, 0x85, 0x34, 0x11, 0x85, 0x67, 0x84, 0xde, 0xe7, 0x46, 0x75, 0xad, 0x24, 0xb5, 0xd1, 0x8d, + 0xa7, 0x03, 0x55, 0x19, 0xd9, 0x38, 0x47, 0xf0, 0xd5, 0xd1, 0x54, 0xd3, 0x82, 0x62, 0x12, 0x7b, + 0xf4, 0x46, 0x7c, 0xdc, 0x11, 0x8c, 0x39, 0x04, 0x62, 0x20, 0x05, 0x39, 0x33, 0x3a, 0x7e, 0xd1, + 0x90, 0x7b, 0x44, 0xe4, 0x18, 0x14, 0xb9, 0x48, 0x3f, 0x36, 0x4d, 0x1e, 0x89, 0x84, 0x1c, 0x31, + 0x7c, 0x78, 0x19, 0x98, 0x4d, 0x08, 0x79, 0x97, 0xc4, 0xe4, 0xd9, 0x10, 0xb6, 0x20, 0x4e, 0x76, + 0xd2, 0x89, 0x8d, 0x74, 0x64, 0x28, 0x01, 0x47, 0x14, 0x23, 0x96, 0xb2, 0x53, 0x8f, 0x44, 0xdb, + 0x28, 0x49, 0x39, 0x19, 0x4d, 0x0e, 0x0d, 0x58, 0xd2, 0xb8, 0xc9, 0x21, 0x35, 0xd5, 0x4a, 0x92, + 0x31, 0xc3, 0x96, 0x8f, 0x93, 0xe5, 0xd2, 0x68, 0xa9, 0x13, 0x13, 0xae, 0x92, 0x8f, 0xcb, 0x62, + 0xd9, 0x2e, 0x79, 0x39, 0x4c, 0x3b, 0x16, 0x13, 0x94, 0xc7, 0x14, 0x66, 0x2c, 0x99, 0xb9, 0x49, + 0x68, 0xa6, 0x12, 0x99, 0xcf, 0x84, 0xd8, 0xaf, 0x7c, 0xf9, 0x4a, 0x55, 0x56, 0x93, 0x5e, 0xa7, + 0xc4, 0x57, 0x4d, 0x3a, 0x94, 0xcc, 0x6a, 0xf4, 0x11, 0x97, 0xe0, 0xf0, 0x60, 0x26, 0xa5, 0xf9, + 0x4b, 0x72, 0x96, 0x13, 0x9c, 0xdb, 0xf4, 0xe6, 0xce, 0x4c, 0xa9, 0x0d, 0x07, 0xf6, 0x12, 0x9d, + 0xd7, 0x84, 0x67, 0x3c, 0xcd, 0xf9, 0x49, 0x6b, 0x8e, 0x88, 0x95, 0xe7, 0x70, 0x5f, 0x38, 0xe1, + 0xd8, 0x4d, 0x71, 0x9a, 0x44, 0x9e, 0xff, 0x54, 0x63, 0x2e, 0x9d, 0x41, 0x8f, 0x06, 0x15, 0x14, + 0xa1, 0x95, 0x4c, 0x55, 0x42, 0xfe, 0xfd, 0xd9, 0x4e, 0x4a, 0x1e, 0x14, 0x22, 0x21, 0x81, 0xe8, + 0x39, 0xf5, 0x39, 0x35, 0x64, 0x70, 0x44, 0xa1, 0x11, 0x55, 0xe7, 0x3b, 0x29, 0x5a, 0x51, 0x8b, + 0xe6, 0x93, 0x9b, 0x1f, 0xad, 0xc8, 0x46, 0x39, 0x7a, 0x51, 0x92, 0x46, 0xd3, 0xa4, 0x27, 0x15, + 0xe9, 0xd3, 0x30, 0x3a, 0x38, 0x56, 0x01, 0xc4, 0x7e, 0x29, 0x75, 0xe7, 0x4a, 0x73, 0x61, 0x10, + 0x9a, 0x8e, 0xd4, 0xa6, 0xb3, 0xfc, 0x48, 0x4e, 0x0b, 0x34, 0x4f, 0x95, 0xde, 0x34, 0x16, 0x0b, + 0x81, 0xca, 0x2d, 0xf9, 0xb9, 0x4c, 0xa2, 0x16, 0x55, 0xa7, 0x2f, 0xe5, 0x69, 0x4f, 0x55, 0x21, + 0x11, 0xa3, 0x1e, 0x55, 0x99, 0x49, 0x4d, 0x49, 0x54, 0x99, 0xda, 0x54, 0x8f, 0x96, 0x54, 0x14, + 0x1e, 0xd2, 0xc8, 0x54, 0x05, 0xda, 0xd0, 0x50, 0xb8, 0xc8, 0xa7, 0x41, 0xd5, 0xea, 0x56, 0x35, + 0xa1, 0x23, 0xa5, 0x7e, 0x95, 0xa1, 0xe3, 0x74, 0x89, 0x90, 0xa0, 0xfa, 0x3a, 0x89, 0x86, 0x15, + 0x13, 0x4e, 0xb2, 0xea, 0x5a, 0x35, 0x1a, 0x47, 0xb7, 0xd6, 0x95, 0xab, 0xbf, 0x33, 0xeb, 0x59, + 0x59, 0xd1, 0x30, 0xb1, 0xf6, 0xd5, 0x9e, 0x01, 0xbd, 0x44, 0xbf, 0x04, 0x1b, 0x57, 0x62, 0xb6, + 0x15, 0x27, 0x87, 0x45, 0xeb, 0xf1, 0xa8, 0x3a, 0xd7, 0x9e, 0x84, 0xcc, 0xb1, 0x83, 0x05, 0x6b, + 0x5e, 0x0d, 0xdb, 0x32, 0xc0, 0x3e, 0xd6, 0xa0, 0x97, 0x65, 0xec, 0x64, 0xe9, 0xfa, 0x3d, 0xb6, + 0x16, 0x11, 0xb3, 0x99, 0x7d, 0xc4, 0xfd, 0x44, 0xdb, 0x59, 0xd3, 0xa6, 0x0c, 0x11, 0xa7, 0xc5, + 0xeb, 0x0f, 0x28, 0x5b, 0x5a, 0xd6, 0xb6, 0x96, 0xa5, 0xaf, 0x9d, 0x49, 0xc6, 0xf6, 0x10, 0x17, + 0xd7, 0xd6, 0x16, 0xb4, 0xab, 0x15, 0xca, 0xfb, 0x40, 0xba, 0x46, 0xcd, 0xc6, 0xf6, 0x10, 0x1f, + 0xd4, 0x45, 0x0d, 0x55, 0xfe, 0x3b, 0x5c, 0xe2, 0x16, 0x97, 0xac, 0xdd, 0xf3, 0xec, 0x67, 0x49, + 0x9b, 0x5b, 0x9c, 0x1e, 0x17, 0xb9, 0x8d, 0xe5, 0xed, 0x72, 0xed, 0xda, 0x41, 0xe8, 0x16, 0x0c, + 0xb6, 0xd1, 0x25, 0x49, 0x05, 0x9d, 0x1b, 0x58, 0xee, 0x76, 0x77, 0x14, 0x3d, 0xd4, 0xae, 0x94, + 0x10, 0xfb, 0x47, 0xf4, 0x56, 0xd1, 0xba, 0xe7, 0x55, 0x6f, 0x14, 0xdd, 0x3b, 0x5d, 0xe1, 0xee, + 0x55, 0xaf, 0x61, 0x34, 0xef, 0x7a, 0x6d, 0x3b, 0x5f, 0xfa, 0xd6, 0x97, 0xba, 0xe5, 0xc5, 0xef, + 0x5b, 0xc9, 0x9b, 0x47, 0xdc, 0x96, 0x50, 0xbc, 0x63, 0xc5, 0x6e, 0x21, 0xf9, 0xd0, 0x35, 0x03, + 0xab, 0xc8, 0xbb, 0x31, 0xf3, 0xc3, 0xd7, 0xe0, 0x6a, 0x22, 0x59, 0x64, 0x93, 0x17, 0x57, 0x93, + 0xb0, 0x86, 0x98, 0xdb, 0x0b, 0xa6, 0x64, 0xd5, 0xa5, 0x2d, 0x65, 0xf0, 0x34, 0xad, 0xb2, 0x53, + 0x82, 0xfe, 0x14, 0xc3, 0x1f, 0xde, 0x42, 0x59, 0x39, 0xfc, 0x50, 0xe9, 0xde, 0x13, 0x0b, 0x89, + 0x45, 0x69, 0x87, 0x2d, 0xbc, 0x4e, 0x2b, 0x54, 0x16, 0xc5, 0x03, 0xf5, 0x6a, 0x8c, 0x9b, 0x30, + 0x63, 0x11, 0x87, 0x54, 0xa6, 0x37, 0x56, 0x4b, 0x8b, 0xf1, 0x39, 0x0f, 0xdd, 0x7e, 0x53, 0xc6, + 0x3f, 0x66, 0x67, 0x8a, 0x85, 0xd1, 0xcf, 0xb2, 0x14, 0x99, 0x9a, 0x47, 0x46, 0x32, 0x4c, 0x94, + 0x7c, 0x57, 0x33, 0xee, 0x18, 0xb8, 0x43, 0xc6, 0xf1, 0x92, 0x9d, 0x59, 0x63, 0x87, 0xf6, 0x58, + 0x12, 0x57, 0xf6, 0xe4, 0x4a, 0x00, 0x1a, 0x4c, 0x22, 0x47, 0xb9, 0x48, 0x41, 0x86, 0x6c, 0x2d, + 0xa1, 0x7c, 0x62, 0x2c, 0x27, 0xd9, 0xcc, 0xcd, 0xb4, 0xf2, 0x98, 0xf1, 0xb8, 0x66, 0x36, 0xff, + 0x04, 0xcd, 0x0b, 0x95, 0xe4, 0x9c, 0x91, 0x1a, 0x66, 0x37, 0xa7, 0xd9, 0xcb, 0x55, 0x56, 0x6c, + 0x9e, 0x7d, 0xfc, 0xfe, 0x66, 0x3b, 0xe7, 0x4c, 0xae, 0x7d, 0xe6, 0x72, 0xa0, 0xd1, 0x18, 0x67, + 0xc2, 0xde, 0x59, 0xcf, 0x75, 0x46, 0xf4, 0x8a, 0x9d, 0x5a, 0x62, 0x43, 0xef, 0x59, 0xca, 0x8f, + 0x86, 0xf4, 0x84, 0x95, 0x90, 0x63, 0x58, 0xfe, 0xd9, 0xd2, 0x83, 0x16, 0xf3, 0xa4, 0xc9, 0x5c, + 0x69, 0xa1, 0x2e, 0x1a, 0xd0, 0x9f, 0x96, 0xe3, 0xa6, 0x45, 0x1d, 0x69, 0x4c, 0x77, 0xd9, 0xd4, + 0x6d, 0xc6, 0xe6, 0xa5, 0xa3, 0x71, 0x68, 0x4b, 0x9e, 0x19, 0x98, 0xa1, 0x56, 0x75, 0xac, 0x51, + 0x39, 0x6a, 0x5d, 0x16, 0xda, 0xd6, 0xa5, 0x16, 0xf4, 0x7e, 0x75, 0x7d, 0x6a, 0x58, 0xf7, 0x9a, + 0x90, 0x0d, 0x86, 0xdb, 0xae, 0x85, 0xdd, 0x68, 0xd4, 0x65, 0x58, 0xd6, 0xc7, 0x7e, 0xcb, 0xaa, + 0x89, 0x1d, 0x60, 0x98, 0x16, 0x5b, 0xd2, 0xc9, 0x76, 0xe5, 0xb4, 0xad, 0x3d, 0x6b, 0x46, 0x77, + 0x94, 0x91, 0x9d, 0x16, 0x65, 0xb3, 0x8f, 0x90, 0x69, 0x38, 0x47, 0xdb, 0x98, 0xc1, 0x76, 0xf6, + 0xad, 0x69, 0x1d, 0x44, 0x3d, 0x96, 0x1b, 0xdc, 0xcf, 0x56, 0xf7, 0x81, 0x71, 0xfd, 0x6d, 0x23, + 0x84, 0x1b, 0xda, 0x37, 0x74, 0x74, 0xbc, 0x79, 0x30, 0x6f, 0x7b, 0xbf, 0x9b, 0xd9, 0xeb, 0x96, + 0x77, 0xbb, 0xf9, 0xfd, 0x6b, 0x7d, 0x67, 0x9b, 0xd4, 0xd5, 0x26, 0x77, 0xc0, 0x05, 0xde, 0x6a, + 0x6a, 0x6f, 0x1b, 0x92, 0xef, 0x05, 0xe4, 0x96, 0x79, 0x5d, 0x70, 0x7a, 0x8e, 0x17, 0xd4, 0xb5, + 0x46, 0xf6, 0xc2, 0xbd, 0xfd, 0x43, 0x4a, 0xdf, 0x5b, 0x6d, 0xe7, 0x96, 0xf6, 0x66, 0x35, 0xde, + 0x6f, 0x7c, 0xff, 0xdb, 0xd8, 0xe9, 0xf5, 0xe2, 0xc3, 0x2d, 0x5e, 0x53, 0x84, 0xff, 0x56, 0xcd, + 0x03, 0x57, 0x78, 0xca, 0xdd, 0x3d, 0x71, 0x4d, 0x87, 0x9c, 0xe3, 0xc3, 0x26, 0xf9, 0xca, 0x5d, + 0x78, 0x72, 0xfe, 0x73, 0xd7, 0x1c, 0xdd, 0x31, 0xf7, 0xdf, 0xab, 0x75, 0x1e, 0x71, 0x42, 0xdf, + 0xdc, 0x78, 0x59, 0x44, 0x79, 0x88, 0x01, 0x9e, 0x46, 0xcf, 0xd5, 0x1b, 0xe2, 0x17, 0xb7, 0x79, + 0x68, 0x0d, 0xd7, 0x70, 0x82, 0x37, 0x1d, 0x6f, 0x1f, 0xb7, 0xdb, 0xd3, 0x99, 0xfe, 0x72, 0x65, + 0x57, 0xdd, 0x6c, 0x49, 0xd7, 0x76, 0xd6, 0xb1, 0x3d, 0xf2, 0xe0, 0x5c, 0xdd, 0xe8, 0x1b, 0xd6, + 0x7a, 0xc7, 0x1d, 0x17, 0x76, 0x2e, 0x4e, 0xd2, 0xec, 0x41, 0x57, 0x7a, 0xdb, 0x5f, 0x90, 0x6f, + 0x9e, 0xa7, 0xdd, 0x6b, 0x65, 0x07, 0xfa, 0xd4, 0x5d, 0x7d, 0x74, 0xd8, 0xbc, 0x1d, 0x31, 0x73, + 0x17, 0xfa, 0xce, 0x41, 0xf3, 0x75, 0x7f, 0x9f, 0xdd, 0xb2, 0x7d, 0xc7, 0x4c, 0xde, 0xd9, 0x3d, + 0x78, 0x30, 0xdf, 0x1d, 0x37, 0x75, 0x47, 0xfc, 0xdf, 0xfd, 0x1e, 0x78, 0x83, 0x3d, 0x58, 0xea, + 0x91, 0x97, 0xf8, 0xe4, 0xd5, 0x95, 0x60, 0xaf, 0x1f, 0x1e, 0xef, 0x99, 0xe7, 0x4f, 0xe7, 0x5d, + 0xbe, 0x79, 0xcb, 0xaf, 0xdd, 0x58, 0x03, 0x26, 0xfb, 0xdd, 0x9c, 0x5e, 0x61, 0x65, 0x95, 0xde, + 0xee, 0x95, 0xe7, 0x74, 0xfb, 0x7c, 0xd5, 0x39, 0x4f, 0xef, 0x9d, 0xca, 0xa7, 0xc7, 0x50, 0xec, + 0x35, 0xdf, 0x78, 0x8f, 0xf7, 0x57, 0x56, 0xad, 0xc3, 0x7a, 0xe8, 0x5d, 0xdf, 0x7b, 0x5d, 0xed, + 0x9e, 0xf5, 0xbf, 0xf7, 0xeb, 0xeb, 0x85, 0xff, 0x5d, 0xdf, 0xe7, 0x1e, 0xf8, 0xfd, 0xe3, 0xd1, + 0xf0, 0x1d, 0x3f, 0x7b, 0x1e, 0xa7, 0x1e, 0x48, 0xcd, 0x07, 0xfd, 0xf2, 0x8d, 0x5f, 0x40, 0xea, + 0xdf, 0x57, 0xf9, 0xb5, 0x17, 0xfd, 0xf6, 0x91, 0x94, 0x7c, 0xd3, 0x4f, 0xdf, 0xfb, 0xf1, 0x05, + 0x7f, 0xf9, 0x05, 0xff, 0x78, 0xc5, 0x67, 0x9f, 0x4a, 0xe7, 0x17, 0x79, 0xe2, 0x6d, 0x3c, 0x7a, + 0xf6, 0xfe, 0x67, 0xd7, 0xfa, 0xdd, 0x67, 0x7e, 0x73, 0xd9, 0x34, 0x7f, 0xee, 0x8f, 0x1f, 0xd5, + 0xdf, 0x57, 0xd9, 0x02, 0x29, 0x1c, 0x5c, 0xfa, 0x77, 0x79, 0xfc, 0xd7, 0x7e, 0x4e, 0x33, 0x44, + 0x51, 0x71, 0x7f, 0x02, 0xf8, 0x79, 0x04, 0x98, 0x80, 0x86, 0x37, 0x45, 0x08, 0xb8, 0x5b, 0xb8, + 0x57, 0x7f, 0x8a, 0x56, 0x80, 0x74, 0x77, 0x80, 0x5b, 0x11, 0x80, 0xe2, 0x37, 0x80, 0x90, 0x57, + 0x81, 0x16, 0xb8, 0x41, 0x89, 0x10, 0x81, 0x94, 0x57, 0x7c, 0x9c, 0xf5, 0x7c, 0x0e, 0x38, 0x3a, + 0x5c, 0x90, 0x81, 0xc4, 0x77, 0x7d, 0xea, 0x97, 0x7f, 0xa8, 0x11, 0x53, 0x26, 0xd6, 0x40, 0xf4, + 0xb7, 0x7f, 0x14, 0x98, 0x82, 0x1e, 0xf3, 0x82, 0xca, 0x10, 0x83, 0x0a, 0x18, 0x7f, 0x72, 0xd6, + 0x80, 0x22, 0x93, 0x51, 0x2c, 0x96, 0x83, 0x1a, 0xb8, 0x80, 0x34, 0x38, 0x5a, 0x12, 0xb3, 0x4f, + 0x60, 0x51, 0x84, 0x32, 0xb8, 0x81, 0x7e, 0xd6, 0x45, 0x92, 0x77, 0x84, 0x40, 0x98, 0x5a, 0x42, + 0xb8, 0x83, 0x2c, 0x18, 0x84, 0x02, 0x93, 0x4e, 0x74, 0x16, 0x59, 0xd0, 0xb7, 0x78, 0x42, 0xd6, + 0x83, 0x56, 0x58, 0x4f, 0x38, 0x38, 0x48, 0x22, 0xb8, 0x82, 0x5c, 0x58, 0x83, 0x5e, 0xf8, 0x85, + 0x58, 0x58, 0x55, 0x52, 0x78, 0x7c, 0x54, 0x18, 0x86, 0xf2, 0x32, 0x54, 0x4a, 0x78, 0x86, 0x70, + 0x38, 0x85, 0xa8, 0x15, 0x82, 0xfa, 0xf2, 0x86, 0x72, 0x78, 0x83, 0x3a, 0xb8, 0x86, 0x24, 0x98, + 0x84, 0xfe, 0xf2, 0x54, 0x78, 0xb8, 0x36, 0x62, 0x38, 0x81, 0x6c, 0x58, 0x58, 0xf6, 0x72, 0x87, + 0x6a, 0x18, 0x88, 0x80, 0x78, 0x7b, 0xd8, 0xf7, 0x57, 0x76, 0xd8, 0x88, 0x5a, 0x58, 0x88, 0x88, + 0xb8, 0x88, 0x44, 0xf8, 0x87, 0x86, 0x78, 0x88, 0x2a, 0x78, 0x85, 0x8a, 0xb8, 0x7e, 0x3c, 0x58, + 0xfe, 0x89, 0x96, 0x78, 0x89, 0xe8, 0x97, 0x86, 0x98, 0x38, 0x83, 0x9c, 0x18, 0x87, 0x98, 0x17, + 0x89, 0x92, 0x78, 0x82, 0x9a, 0x18, 0x7c, 0x4c, 0xf8, 0x89, 0x7e, 0xd8, 0x8a, 0x34, 0x17, 0x8a, + 0x90, 0x38, 0x82, 0x5a, 0xf6, 0x88, 0xe8, 0x91, 0x85, 0xa0, 0x78, 0x8a, 0xb2, 0x38, 0x86, 0xb4, + 0xd8, 0x89, 0xa6, 0x98, 0x8b, 0xb8, 0x58, 0x8b, 0xb0, 0xb8, 0x85, 0xbc, 0xf8, 0x84, 0x08, 0x72, + 0x8b, 0xee, 0x37, 0x51, 0xa8, 0xb8, 0x8a, 0x94, 0xf8, 0x80, 0xb6, 0x97, 0x8c, 0xa2, 0x58, 0x8c, + 0x7a, 0xb8, 0x7a, 0x8c, 0x38, 0x41, 0xae, 0x72, 0x8c, 0xc2, 0xf8, 0x8a, 0x4c, 0x34, 0x8d, 0xd4, + 0x38, 0x43, 0xce, 0xf8, 0x8c, 0xba, 0x58, 0x8a, 0xca, 0x58, 0x82, 0xdc, 0xb8, 0x26, 0x28, 0xb2, + 0x58, 0xe2, 0xd8, 0x8c, 0x12, 0x38, 0x8a, 0xf6, 0x47, 0x23, 0xe7, 0x08, 0x8d, 0x79, 0x88, 0x8e, + 0xe1, 0x67, 0x70, 0xe5, 0x08, 0x23, 0xee, 0x08, 0x8e, 0xd1, 0x18, 0x8f, 0xfd, 0xb7, 0x2a, 0xf0, + 0xf7, 0x8b, 0xc8, 0xd8, 0x8f, 0xd8, 0x38, 0x8b, 0xfb, 0xa8, 0x60, 0xd9, 0x48, 0x46, 0xe9, 0x28, + 0x88, 0xeb, 0x28, 0x90, 0x30, 0x16, 0x8b, 0xc0, 0xd8, 0x8b, 0xfe, 0x38, 0x8c, 0x09, 0x09, 0x5f, + 0x0d, 0x09, 0x90, 0x99, 0x28, 0x8d, 0x93, 0x08, 0x91, 0xc6, 0x75, 0x8d, 0x54, 0x84, 0x8f, 0xef, + 0x38, 0x87, 0x17, 0x09, 0x60, 0xdf, 0xc8, 0x90, 0x14, 0x99, 0x8f, 0x1d, 0xe8, 0x91, 0xfa, 0x15, + 0x8c, 0x1a, 0xf9, 0x83, 0x15, 0xb9, 0x89, 0x25, 0x39, 0x90, 0x12, 0x89, 0x92, 0xf0, 0xc8, 0x91, + 0x7b, 0xc8, 0x92, 0x11, 0x29, 0x92, 0x31, 0x39, 0x40, 0xaa, 0x38, 0x8e, 0x33, 0x69, 0x92, 0x04, + 0xa9, 0x76, 0x2b, 0x74, 0x90, 0x4b, 0xa8, 0x93, 0x7c, 0x05, 0x92, 0x0e, 0xc9, 0x93, 0x3c, 0xfe, + 0x14, 0x90, 0x41, 0xc9, 0x5f, 0x27, 0xa9, 0x8d, 0xa9, 0xa8, 0x92, 0xcb, 0x88, 0x94, 0x04, 0xe6, + 0x92, 0x4b, 0x39, 0x42, 0x36, 0x69, 0x91, 0x4f, 0x49, 0x93, 0xe1, 0x48, 0x95, 0x53, 0x79, 0x8f, + 0x40, 0x69, 0x95, 0xec, 0xa5, 0x94, 0x05, 0x59, 0x8d, 0x38, 0x59, 0x7d, 0x5d, 0xb9, 0x93, 0x51, + 0x09, 0x96, 0x1f, 0xa8, 0x8e, 0x5c, 0x49, 0x96, 0xf2, 0xf5, 0x95, 0x3d, 0x79, 0x93, 0x23, 0x49, + 0x92, 0x6b, 0x49, 0x0b, 0x19, 0x29, 0x95, 0x5b, 0xf4, 0x93, 0x6a, 0x29, 0x97, 0xb2, 0x35, 0x94, + 0x13, 0xb9, 0x91, 0x5b, 0x89, 0x97, 0x79, 0xe9, 0x5b, 0x7b, 0xf9, 0x92, 0x3e, 0x29, 0x96, 0x63, + 0x09, 0x98, 0x6c, 0x59, 0x94, 0x46, 0xd9, 0x97, 0x21, 0xb9, 0x8b, 0x87, 0x29, 0x60, 0x82, 0x39, + 0x98, 0x5a, 0xe9, 0x97, 0x43, 0xe8, 0x98, 0x7a, 0xb9, 0x90, 0x8c, 0x99, 0x88, 0x85, 0x29, 0x8f, + 0x95, 0x19, 0x98, 0x90, 0x59, 0x97, 0xdd, 0x98, 0x96, 0x7f, 0xc9, 0x99, 0x1a, 0x46, 0x97, 0x9f, + 0xb9, 0x44, 0x50, 0xf8, 0x7e, 0xa3, 0x89, 0x84, 0xa5, 0x69, 0x9a, 0xf4, 0x28, 0x7b, 0xe9, 0xa7, + 0x9a, 0x68, 0xd0, 0x86, 0xa1, 0x89, 0x96, 0x68, 0xf8, 0x90, 0xb1, 0x09, 0x62, 0x9e, 0xc9, 0x97, + 0x61, 0xf9, 0x9a, 0xd1, 0x87, 0x9b, 0xb4, 0x09, 0x93, 0xaa, 0x48, 0x06, 0x63, 0xf7, 0x9b, 0x8f, + 0xc9, 0x9a, 0x44, 0x09, 0x9a, 0xa8, 0x59, 0x78, 0xc5, 0x09, 0x83, 0xf6, 0xd8, 0x9b, 0xae, 0xd9, + 0x9c, 0x71, 0xc7, 0x9c, 0x10, 0xe8, 0x9c, 0x4e, 0xb6, 0x75, 0xd3, 0x29, 0x07, 0x7d, 0x48, 0x8c, + 0xa9, 0x89, 0x9d, 0x70, 0x59, 0x9b, 0x7c, 0xc8, 0x9d, 0xdd, 0x39, 0x99, 0x8b, 0x29, 0x7d, 0xd2, + 0x29, 0x9e, 0x18, 0x18, 0x85, 0xd6, 0x49, 0x9c, 0xe7, 0x99, 0x9b, 0xb3, 0xa9, 0x9e, 0xfe, 0xd7, + 0xc9, 0x9e, 0x20, 0xa8, 0x9d, 0xe5, 0x09, 0x9f, 0xf1, 0x39, 0x9c, 0x75, 0x48, 0x5b, 0xeb, 0x69, + 0x9f, 0x28, 0x88, 0x9f, 0xfc, 0xa8, 0x9f, 0xfb, 0xb9, 0x9a, 0x55, 0xa8, 0x90, 0xb3, 0x05, 0xa0, + 0xe8, 0x29, 0xa0, 0x6a, 0x35, 0x74, 0x05, 0x6a, 0xa0, 0x07, 0xda, 0x92, 0xf5, 0xa9, 0xa0, 0xb6, + 0xe9, 0x9e, 0x10, 0x76, 0x5d, 0x0f, 0x1a, 0xa0, 0x65, 0x78, 0x95, 0xe6, 0x49, 0xa1, 0x9a, 0x99, + 0x99, 0x0d, 0xfa, 0x9f, 0x19, 0xaa, 0xa1, 0x1b, 0x7a, 0xa1, 0x0e, 0xea, 0xa1, 0x4d, 0x69, 0x96, + 0x96, 0x59, 0x72, 0x23, 0x0a, 0xa1, 0x0c, 0x9a, 0x94, 0x51, 0x87, 0xa2, 0x29, 0xaa, 0xa2, 0xca, + 0x55, 0x74, 0x2d, 0xfa, 0xa1, 0xe4, 0xd9, 0x99, 0x07, 0x27, 0xa3, 0xde, 0x49, 0xa3, 0x47, 0x11, + 0x49, 0x37, 0x3a, 0x9e, 0xe9, 0x39, 0x97, 0xe3, 0xc6, 0xa3, 0x67, 0xf9, 0x8f, 0xd9, 0x79, 0x6d, + 0x41, 0x9a, 0x95, 0x3e, 0x4a, 0xa4, 0xcb, 0x66, 0xa4, 0x77, 0xd9, 0x84, 0x3a, 0xaa, 0xa4, 0x4b, + 0x4a, 0xa2, 0xf3, 0xd9, 0x9e, 0x4f, 0x0a, 0xa5, 0x47, 0x6a, 0xa1, 0x15, 0xda, 0x6d, 0x55, 0xda, + 0xa3, 0xfa, 0xa8, 0x9c, 0xa9, 0xa6, 0xa5, 0x91, 0x99, 0x93, 0x38, 0xda, 0xa1, 0x5f, 0x4a, 0x42, + 0xb7, 0xa9, 0x45, 0x09, 0x47, 0xa6, 0xad, 0xb9, 0x99, 0x42, 0xba, 0x74, 0x69, 0xea, 0x96, 0xa2, + 0xb9, 0x02, 0xff, 0xe0, 0xa6, 0x98, 0xa9, 0x24, 0x73, 0x8a, 0x9c, 0x11, 0x63, 0xa7, 0x60, 0x6a, + 0x23, 0x79, 0xaa, 0xa7, 0x32, 0xc2, 0xa7, 0x6a, 0x7a, 0x61, 0x7f, 0xfa, 0xa6, 0x7e, 0x2a, 0xa8, + 0x8a, 0xd9, 0x5e, 0x85, 0xaa, 0x42, 0xc9, 0x85, 0xa8, 0x6a, 0x70, 0x5b, 0x82, 0x5a, 0x31, 0x88, + 0xfa, 0xa8, 0x85, 0x1a, 0xa9, 0x8e, 0xda, 0xa8, 0x7f, 0x3a, 0xa9, 0x96, 0x5a, 0xca, 0xa9, 0x7c, + 0x7a, 0xa9, 0x9a, 0x9a, 0xa9, 0x79, 0xba, 0xa9, 0x9e, 0xda, 0xa9, 0x76, 0xfa, 0xa9, 0xa2, 0x1a, + 0xaa, 0x73, 0x3a, 0xaa, 0xa6, 0x5a, 0xaa, 0x6e, 0x7a, 0xaa, 0xaa, 0x9a, 0xaa, 0x69, 0xba, 0xaa, + 0xae, 0xda, 0xaa, 0x64, 0xfa, 0xaa, 0xb2, 0x1a, 0xab, 0x5f, 0x3a, 0xab, 0xb6, 0x5a, 0xab, 0x5a, + 0x5a, 0x60, 0x8b, 0x4a, 0x9a, 0xca, 0xc1, 0xab, 0x92, 0x65, 0x1b, 0xbf, 0x0a, 0x5e, 0x9a, 0x21, + 0xac, 0x5e, 0xe9, 0x18, 0xc5, 0x0a, 0x95, 0x75, 0x81, 0xac, 0x65, 0xb9, 0x16, 0xcb, 0xca, 0xac, + 0x66, 0xe1, 0xac, 0xcf, 0x7a, 0x15, 0xd1, 0x1a, 0xa2, 0x48, 0x41, 0xad, 0xd2, 0x6a, 0xad, 0xd7, + 0x8a, 0xad, 0x3e, 0xa1, 0xad, 0xdb, 0x4a, 0x13, 0xdd, 0xea, 0xad, 0x2f, 0x01, 0xae, 0xe1, 0x5a, + 0x12, 0xe3, 0x9a, 0xac, 0x43, 0x61, 0xae, 0xfe, 0xc5, 0x15, 0xe9, 0x6a, 0xac, 0x4d, 0xc1, 0xae, + 0xf6, 0xe5, 0xae, 0xef, 0x8a, 0x98, 0xf1, 0x2a, 0xaf, 0x26, 0x1a, 0x16, 0xf5, 0x6a, 0xaf, 0xeb, + 0x8a, 0xaf, 0x35, 0x7a, 0xaf, 0xfb, 0xfa, 0xa3, 0x70, 0xe1, 0xaf, 0x4e, 0x0a, 0xb0, 0x01, 0xdb, + 0xab, 0x7a, 0x41, 0xb0, 0x00, 0x48, 0x18, 0x07, 0x4b, 0x9d, 0x89, 0xa1, 0xb0, 0x53, 0xca, 0xb0, + 0x0d, 0xcb, 0x9f, 0xa2, 0x01, 0xb1, 0x58, 0xea, 0x19, 0x13, 0x0b, 0x9c, 0x0f, 0x6b, 0xb1, 0x74, + 0x6a, 0x27, 0x1b, 0xcb, 0xb1, 0x76, 0x50, 0x00, 0x00, 0x3b }; diff --git a/src/utils/gui/images/textures/POITextures/Fuel.cpp b/src/utils/gui/images/textures/POITextures/Fuel.cpp index e5cf94c16044..c0a15daca037 100644 --- a/src/utils/gui/images/textures/POITextures/Fuel.cpp +++ b/src/utils/gui/images/textures/POITextures/Fuel.cpp @@ -21,220 +21,220 @@ const unsigned char POITexture_Fuel[] = { - 0x47,0x49,0x46,0x38,0x39,0x61,0x00,0x02,0x00,0x02,0x80,0x01,0x00,0x00,0x00,0x00, - 0xff,0xff,0xff,0x21,0xfe,0x11,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69, - 0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x00,0x21,0xf9,0x04,0x01,0x0a,0x00,0x01,0x00, - 0x2c,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x02,0x00,0x02,0xfe,0x8c,0x8f,0xa9,0xcb, - 0xed,0x0f,0x63,0x04,0xb4,0xda,0x8b,0xb3,0xde,0xbc,0xfb,0x0f,0x86,0xe2,0x48,0x96, - 0xa4,0x84,0xa6,0xea,0xca,0xb6,0xee,0x0b,0xc7,0xf2,0x4c,0x3f,0xe6,0x8d,0xe7,0xfa, - 0xce,0xf7,0xbe,0x55,0x0b,0x0a,0x87,0xc4,0xa2,0xf1,0x88,0xfc,0x29,0x97,0xcc,0xa6, - 0xf3,0x09,0x44,0x4a,0xa7,0xd4,0xaa,0xf5,0xba,0x80,0x6a,0xb7,0xdc,0xae,0xb7,0x82, - 0x0d,0x8b,0xc7,0xe4,0xb2,0xe1,0x8b,0x4e,0xab,0xd7,0x26,0xb3,0xfb,0x0d,0x8f,0xa3, - 0xd8,0xf4,0xba,0xdd,0x2e,0xcf,0xeb,0xf7,0xe1,0xbb,0xff,0x0f,0xb8,0xc5,0x37,0x48, - 0x58,0x18,0x13,0x88,0x98,0xa8,0xc8,0x63,0xd8,0xe8,0xf8,0x88,0xb0,0x28,0x39,0x49, - 0x09,0x02,0x79,0x89,0x19,0x57,0xb9,0xc9,0xd9,0x49,0x91,0x09,0x1a,0x6a,0xe5,0x49, - 0x5a,0xaa,0x28,0x8a,0x9a,0x1a,0x64,0xca,0xda,0xfa,0xa7,0x0a,0x1b,0xab,0xe2,0x4a, - 0x5b,0xbb,0x26,0x8b,0x9b,0xab,0x60,0xcb,0xdb,0xcb,0xa5,0x0b,0x1c,0xeb,0x3b,0x4c, - 0xec,0x14,0x7c,0x0c,0x5a,0xac,0xbc,0xdc,0x83,0xec,0xec,0xc8,0x1c,0x2d,0xdd,0xf6, - 0x5c,0xbd,0x37,0x8d,0x9d,0xfd,0x61,0xcd,0x0d,0xa7,0xfd,0x0d,0x8e,0xd1,0x3d,0x3e, - 0x16,0x6e,0x6e,0x4e,0x9e,0x5e,0x75,0xce,0x0e,0xae,0xfe,0x6e,0xd4,0x2e,0xaf,0x0d, - 0x5f,0x5f,0x33,0x8f,0x8f,0x6d,0xbf,0xff,0x92,0xef,0x2f,0xcd,0x2f,0xe0,0xac,0x7f, - 0x04,0x8b,0x09,0x3c,0x08,0xa1,0xa0,0x42,0x62,0x08,0x1b,0xee,0x5a,0x08,0xb1,0x97, - 0xc3,0x89,0x11,0x2b,0xf2,0x9a,0xd8,0xd0,0xa2,0x46,0xfe,0x57,0x18,0x0f,0x6e,0xfc, - 0xc8,0xaa,0x23,0x3f,0x90,0x24,0x49,0x89,0xdc,0x57,0x32,0x25,0xa7,0x93,0xf0,0x54, - 0xba,0xac,0xc4,0x52,0xdd,0xcb,0x99,0x8b,0x62,0x92,0xa3,0x89,0x33,0x91,0xcd,0x6e, - 0x39,0x7b,0xbe,0xda,0x59,0xcd,0xa7,0xd0,0x3b,0x40,0x9f,0x0d,0x3d,0xca,0xa6,0x28, - 0x32,0xa4,0x4c,0xd5,0x28,0x0d,0xd6,0x34,0xaa,0x97,0xa7,0xba,0xa4,0x5a,0xfd,0x45, - 0x55,0xd6,0xd5,0xad,0x4f,0xb2,0x6a,0xe5,0x0a,0x56,0x89,0x57,0x58,0x61,0xcb,0xfe, - 0x18,0x9b,0xca,0xac,0xda,0x1d,0x68,0x51,0xad,0x7d,0x7b,0xa3,0x6d,0x28,0xb8,0x74, - 0x4b,0xc8,0xcd,0x54,0x37,0x6f,0x88,0xbb,0x98,0xf4,0xfa,0xed,0xc0,0xf7,0xd2,0xdf, - 0xc1,0x19,0x02,0x3f,0x22,0x8c,0xf8,0x82,0xe1,0x46,0x89,0x1b,0x03,0x58,0x6c,0xc8, - 0x71,0x62,0xc8,0x85,0x24,0x23,0xa6,0x4c,0xc8,0x32,0x61,0xcc,0x83,0x34,0x0f,0xe6, - 0x7c,0xcd,0xf3,0x67,0xd0,0x72,0x44,0x8f,0x26,0xed,0xcd,0xb4,0x5f,0xd4,0x9a,0x54, - 0xeb,0x65,0x9d,0xda,0x75,0x5d,0xd8,0x6f,0x64,0xe7,0xa5,0xed,0xc6,0xf6,0x6c,0xdc, - 0x65,0x74,0xd3,0xe5,0xdd,0xbb,0x16,0x70,0x18,0xb6,0x86,0x97,0x6b,0x65,0x9c,0x06, - 0xc7,0xe4,0x58,0x42,0x32,0xbf,0x67,0xea,0xf9,0x95,0xe8,0xd2,0xa1,0x9b,0xac,0x4e, - 0xa5,0x14,0xf6,0x55,0xd7,0xb7,0x27,0xf1,0xe4,0x9d,0x7b,0xa7,0xf0,0xdf,0x57,0x92, - 0xb7,0xbe,0xe9,0x7c,0x3c,0xf3,0xea,0x95,0xb3,0x6f,0x2f,0x1e,0x26,0xfc,0x19,0xe3, - 0xe7,0xc7,0x9f,0x64,0xdf,0xbd,0xfc,0xfc,0xf4,0xfe,0xd3,0xf3,0x3f,0xe4,0xdf,0x7f, - 0x00,0xee,0x27,0x60,0x0b,0xef,0x15,0x68,0x20,0x81,0x08,0xb2,0x10,0xe0,0x82,0x0c, - 0x2a,0xe8,0x60,0x0a,0x0d,0x46,0x28,0x21,0x84,0x14,0x4e,0x60,0xe1,0x85,0x36,0x64, - 0xa8,0x61,0x03,0x13,0x76,0xb8,0x21,0x25,0x20,0xce,0xc1,0xe1,0x88,0x09,0x7c,0x68, - 0x62,0x16,0x25,0xa6,0x78,0xc6,0x8a,0x2c,0xa2,0xc8,0x62,0x24,0x2e,0xa6,0x08,0x63, - 0x8c,0x2d,0x8a,0x68,0x23,0x03,0x35,0xda,0xb8,0x63,0x8c,0x3d,0xbe,0x38,0xa3,0x89, - 0x3f,0xd2,0x18,0xe4,0x88,0x43,0x0a,0x59,0x24,0x88,0x47,0x1a,0x99,0x64,0x87,0x4b, - 0x2a,0xd9,0xa4,0x86,0x4f,0x3a,0x19,0xe5,0x85,0x53,0x4a,0x59,0x25,0x85,0x57,0x5a, - 0x99,0x65,0x84,0x5b,0x6a,0xd9,0xa5,0x83,0x5f,0x7a,0x19,0xe6,0x82,0x63,0x8a,0x59, - 0x26,0x82,0x67,0x9a,0x99,0x66,0x81,0x6b,0xaa,0xd9,0xa6,0x80,0x6f,0xba,0x19,0xe7, - 0x7f,0x73,0xca,0x59,0x27,0x7f,0x77,0xda,0x99,0x67,0x7e,0x7b,0xea,0xd9,0xa7,0x7d, - 0x7f,0xfa,0x19,0xe8,0x7c,0x83,0x0a,0x5a,0x28,0x7c,0x87,0x1a,0x9a,0x68,0x7b,0x8b, - 0x2a,0xda,0xa8,0x7a,0x8f,0x3a,0x1a,0xe9,0x79,0x93,0x4a,0x5a,0x29,0x79,0x97,0x5a, - 0x9a,0x69,0x78,0x9b,0x6a,0xda,0xa9,0x77,0x9f,0x7a,0x1a,0xea,0x76,0xa3,0x8a,0x5a, - 0x2a,0x76,0xa7,0x9a,0x9a,0x6a,0x75,0xab,0xaa,0xda,0xaa,0x74,0xaf,0xba,0x1a,0xeb, - 0x73,0xb3,0xca,0x5a,0x2b,0x73,0xb7,0xda,0x9a,0x6b,0x72,0xbb,0xea,0xda,0xab,0x71, - 0xbf,0xfa,0x1a,0xec,0x70,0xc3,0x0a,0x5b,0xfe,0x2c,0x70,0xc7,0x1a,0x9b,0x2c,0x6f, - 0xcb,0x2a,0xdb,0x2c,0x6e,0xcf,0x3a,0x1b,0x2d,0x6d,0xd3,0x4a,0x5b,0x2d,0x6c,0xb3, - 0x7e,0x42,0x2c,0x8e,0x39,0x3e,0xe4,0x6d,0x11,0x1e,0x50,0x1b,0xee,0xb7,0x07,0x5c, - 0x2a,0x82,0xb5,0xd9,0xb2,0xf6,0x28,0x35,0xa4,0x5d,0xab,0x6e,0xb9,0xfd,0xb9,0xcb, - 0x19,0xbc,0xda,0x06,0xaa,0xc3,0xbb,0xeb,0xa2,0x36,0x28,0x23,0xf5,0xee,0xab,0xaf, - 0xbc,0xfd,0x34,0x83,0x99,0xbd,0xec,0xd6,0x29,0x16,0x65,0x06,0xf3,0x8b,0x70,0xc2, - 0x8b,0x2d,0x1c,0x30,0x7e,0x32,0x34,0x01,0x19,0xc4,0xa0,0xdd,0x69,0x8c,0x61,0x16, - 0xff,0x2b,0xf0,0x0a,0x50,0x68,0x0c,0xf0,0xc5,0x6d,0x6a,0x11,0xd8,0xc6,0x05,0x8f, - 0x4c,0xf2,0x5d,0x26,0x2b,0x8c,0x72,0xca,0x6d,0xad,0x5c,0x71,0xcb,0x2e,0x8f,0x05, - 0xf3,0xc3,0x32,0xcf,0x9c,0x55,0xcd,0x20,0x77,0x3c,0x50,0x17,0x68,0xe9,0x5c,0xf2, - 0xcd,0x82,0x78,0x05,0x34,0x5f,0x73,0xa6,0x41,0x74,0xc8,0x1c,0x4b,0x4c,0x1c,0xd2, - 0x54,0x15,0xad,0xb2,0xd0,0x3e,0x3f,0x05,0xb5,0x5c,0x18,0x3b,0xa5,0x54,0xd5,0x2f, - 0xc7,0x99,0x54,0x51,0x5a,0xff,0xcc,0x75,0xd7,0x3b,0x7d,0x4d,0x73,0xc3,0xb7,0x8c, - 0xad,0xf4,0xc9,0x3c,0x3f,0x78,0x76,0x4c,0x64,0x27,0xbd,0xb6,0xc7,0x74,0xd8,0xf4, - 0x76,0xce,0x7d,0xd6,0xe1,0x76,0xda,0x2c,0xc7,0xcd,0x76,0xdb,0x1d,0xd5,0xfd,0x74, - 0xa1,0x78,0x8b,0x04,0x38,0xd5,0x89,0x0e,0x8e,0x51,0xe1,0x59,0x37,0x8a,0xb8,0x43, - 0x8a,0x7b,0x1d,0x69,0xe3,0x08,0x3d,0xfe,0x0e,0xd4,0xa6,0x92,0x0b,0x44,0x39,0xda, - 0x7c,0x0f,0xe8,0x37,0xe6,0x7a,0xc7,0xbc,0x39,0xe7,0x58,0x7b,0xf4,0xb9,0xcd,0xa1, - 0x8b,0xee,0xb4,0xe7,0xa7,0x43,0xb9,0x7a,0xd3,0x62,0x8f,0x54,0xfa,0xce,0x4c,0x4b, - 0x71,0x79,0x4b,0xb1,0x07,0xdd,0x3a,0xea,0x68,0x04,0x94,0x39,0xdd,0xb1,0xd6,0x9e, - 0x4e,0xef,0x79,0xe7,0x3e,0xf1,0xdc,0xf6,0x08,0xcf,0xd2,0xaf,0xc0,0xf3,0x74,0xbb, - 0xd1,0xbd,0x2e,0x6f,0x0d,0xf2,0x27,0x1d,0x0b,0xbd,0x51,0xcd,0x47,0x4d,0x3c,0x7a, - 0xa3,0xdf,0x74,0xbd,0xd5,0xc9,0x56,0x7f,0x8c,0xf4,0x84,0x37,0x0b,0x3e,0x30,0xe2, - 0xff,0x1d,0x6d,0xf9,0xb9,0x9c,0x9f,0x78,0xb5,0xea,0x7f,0x95,0x3d,0x99,0xf1,0x0f, - 0xf1,0x3e,0x59,0xdd,0x6f,0x3d,0x3f,0xfd,0xc6,0x07,0x75,0x3f,0xd8,0xf9,0xeb,0xff, - 0xba,0xa5,0xf4,0xaf,0x6c,0xff,0x13,0x02,0x1e,0xac,0x57,0x40,0x3c,0x25,0x50,0x7b, - 0x9d,0x33,0xdf,0x00,0xe1,0x36,0xbb,0xdc,0x10,0x45,0x80,0x0b,0x04,0x54,0x05,0xe7, - 0x75,0x40,0xa8,0x3c,0xd0,0x6e,0x17,0x2c,0x9e,0x1f,0xc2,0xb7,0xc1,0xc0,0x75,0x50, - 0x77,0xfb,0x5b,0x5f,0x08,0x0d,0x37,0x42,0xd7,0xfd,0xc4,0x84,0x29,0xa4,0x54,0x0b, - 0x5d,0xa0,0x13,0x16,0x46,0xd0,0x5c,0x01,0x58,0xd8,0x29,0x70,0xc1,0x3e,0x8a,0xec, - 0xab,0x26,0xf0,0x9b,0xa1,0xb9,0x6c,0xc8,0x43,0xfb,0xbd,0x90,0x53,0x43,0xec,0x5b, - 0x0c,0x55,0x91,0x43,0xc7,0xed,0xd0,0x87,0x78,0x39,0xe1,0xe2,0x8a,0x28,0x37,0x26, - 0x0a,0xc6,0x89,0x90,0x83,0x62,0xfe,0xcf,0xa4,0x78,0x18,0x2a,0x56,0x6e,0x89,0x56, - 0x2c,0x0f,0x16,0x7d,0xc4,0xc5,0x2e,0xae,0x47,0x8c,0xb4,0x22,0x23,0x86,0x00,0x97, - 0xc4,0x8c,0x84,0xd1,0x8c,0x06,0xd4,0xa2,0xe6,0xbe,0xd8,0x9c,0xfa,0x34,0x91,0x8d, - 0xc0,0xa2,0xa3,0x03,0xba,0x33,0x45,0x3b,0x22,0x4b,0x8f,0x3a,0x02,0xcf,0x1c,0xe1, - 0x48,0x24,0x3e,0xaa,0xc8,0x8f,0x79,0xf4,0x8d,0x5a,0x4a,0x83,0xc7,0x2c,0x1a,0xf2, - 0x90,0xad,0x49,0x24,0x63,0x16,0xc9,0xc8,0xd8,0x10,0x52,0x91,0x90,0x0c,0x0b,0x22, - 0xb5,0x03,0x89,0x4a,0x9a,0xe5,0x92,0x8e,0xac,0x8c,0x26,0x2d,0xd9,0xc8,0x4e,0x66, - 0xe6,0x93,0x60,0xe1,0xa4,0x28,0xf9,0x40,0xca,0x52,0x86,0xf2,0x94,0xa1,0x49,0xe5, - 0x55,0x4c,0x39,0xc9,0xc8,0xb8,0xf2,0x95,0xab,0x8c,0xa5,0x27,0x67,0x29,0x15,0x58, - 0xda,0xb2,0x33,0xb8,0xcc,0x65,0x2d,0x77,0x89,0xca,0x5e,0x46,0x45,0x97,0x72,0x94, - 0xa5,0x30,0x99,0x42,0xcc,0x03,0x8d,0xf2,0x98,0x48,0x49,0x26,0xd4,0x98,0x89,0xcc, - 0x5f,0x02,0x53,0x0f,0xd0,0x6c,0xa6,0x34,0x8b,0xb9,0xcc,0x6a,0xfa,0xc4,0x99,0x45, - 0xd3,0xe6,0x50,0xb8,0xd9,0x3c,0x6f,0x0a,0x05,0x9c,0x82,0xac,0x90,0x38,0x73,0x42, - 0x4e,0x40,0xd6,0xe6,0x9c,0xe8,0xbc,0xa6,0x32,0x83,0xc9,0x4e,0x9a,0xa4,0x53,0x12, - 0xd0,0x88,0xa7,0x3c,0xdd,0xd9,0x4d,0x7b,0xce,0x64,0x9e,0x41,0xbc,0xa5,0x3e,0x55, - 0xc2,0xcf,0x1b,0x1a,0xf3,0x9f,0x29,0x09,0xe8,0x11,0xfd,0x49,0x50,0x92,0x18,0x14, - 0x11,0xf5,0x4c,0x68,0x49,0xfe,0x16,0x1a,0x88,0x86,0x3a,0x14,0x24,0x10,0x05,0x84, - 0x44,0x27,0xba,0x91,0x3c,0x2c,0x67,0xa0,0x18,0xd5,0x88,0x46,0x91,0xf3,0xc8,0x8e, - 0x66,0xb4,0xa2,0x1f,0x0c,0xa9,0x48,0x2d,0xf2,0x51,0xe7,0x70,0xf4,0xa4,0x10,0x49, - 0x29,0x75,0x56,0xca,0x52,0x85,0xb8,0x14,0x93,0x30,0x8d,0x29,0x41,0x66,0xca,0x4a, - 0x92,0xda,0x54,0x1f,0x38,0xc5,0x26,0x2f,0x77,0xba,0x10,0x6a,0xaa,0x14,0xa1,0x40, - 0xfd,0x87,0x50,0x5f,0x4a,0xd4,0xa2,0xe6,0xa3,0x95,0x39,0xc5,0xa7,0x52,0xcf,0xc1, - 0xd4,0x69,0xf6,0xf4,0xa9,0xf2,0x88,0xaa,0x4f,0xe1,0x49,0xd5,0xa5,0x5a,0x35,0x9f, - 0x59,0xd5,0xea,0x51,0xa5,0xaa,0xd3,0xae,0x0e,0x03,0xab,0x57,0xdd,0xaa,0x58,0xd1, - 0x41,0x56,0xae,0x9e,0xb5,0x1d,0x3f,0x2d,0xeb,0x57,0xd7,0x0a,0xd5,0xb6,0xaa,0x15, - 0xae,0x68,0x4d,0x6b,0x39,0x49,0x44,0xd7,0xb8,0xca,0xf5,0xae,0x12,0xc8,0x2b,0x3b, - 0x6a,0x2a,0xd0,0xa4,0xfa,0x95,0xa7,0xd9,0xe4,0xeb,0x19,0x07,0xfb,0x0d,0x93,0xaa, - 0x53,0x82,0x88,0x4d,0xac,0x62,0xfb,0x59,0xd8,0xc6,0x4e,0xe3,0xa2,0x90,0xdd,0xab, - 0x64,0xa3,0x41,0xc9,0xca,0xda,0xf5,0xb2,0xcb,0xc8,0xe4,0x62,0xcd,0xc0,0xd9,0x6c, - 0x14,0xf2,0xa0,0x91,0x0d,0xad,0x32,0xfa,0xa2,0x59,0xb3,0x9a,0x76,0xac,0xa8,0x25, - 0xad,0x65,0x57,0xcb,0xda,0xd6,0x46,0xf4,0xb1,0xb0,0x8d,0xad,0x6c,0x57,0x28,0xd8, - 0xda,0x5e,0x64,0x2e,0xb3,0x05,0xac,0x6e,0x85,0x23,0x8a,0xde,0xe6,0xf6,0xb7,0xb4, - 0x48,0x0b,0x6e,0x4b,0xfe,0x4b,0x5c,0xe0,0x1a,0x37,0x83,0xc3,0x4d,0xee,0x50,0xdd, - 0xc2,0x5c,0xe4,0x3a,0x17,0xa4,0xc2,0x28,0xa1,0x74,0xa7,0x8b,0xd4,0xea,0x6e,0xef, - 0xba,0xd8,0x6d,0x2a,0x6f,0x77,0x47,0xdb,0xee,0x66,0x57,0x86,0x58,0xf1,0xad,0x78, - 0xdd,0x8a,0xc3,0xf2,0x36,0xf7,0xbc,0x69,0x94,0x51,0x57,0xc2,0xcb,0x5e,0xf4,0x3a, - 0x83,0x09,0x94,0x8d,0x2f,0x58,0x29,0x78,0x16,0xf8,0xda,0xd7,0x8d,0x46,0x24,0x98, - 0x79,0xf7,0x4b,0x4f,0x99,0x2c,0xa1,0xbe,0x00,0xe6,0x6f,0x14,0xf3,0xfb,0xdf,0x02, - 0xbb,0x96,0x1b,0xf4,0xd5,0xaf,0x82,0x03,0x3b,0x8e,0x06,0x27,0xf8,0xc1,0x16,0x15, - 0xb0,0xc3,0xd6,0x4b,0xe1,0x0a,0x07,0x6f,0xc0,0x0e,0xce,0xb0,0x86,0xb9,0x77,0x61, - 0xee,0x7a,0xf8,0xb8,0xcc,0x0b,0xf1,0x6b,0x47,0x2c,0xdc,0x08,0x73,0x78,0xc2,0x28, - 0xb6,0x6e,0x89,0x11,0x8c,0xe1,0x16,0xbb,0x98,0xc1,0x2b,0x8e,0xb1,0x8c,0x1b,0x48, - 0x63,0x13,0x6f,0xf6,0xc6,0x13,0xdc,0xb0,0x8e,0x55,0xcb,0xe3,0xfa,0x91,0xd7,0xbf, - 0x36,0x0e,0xf2,0x17,0xde,0x21,0xe1,0x22,0x1b,0x79,0x6a,0x3e,0x86,0xb1,0x88,0x97, - 0x0c,0xde,0x26,0xfb,0x80,0xc0,0x50,0xc6,0x71,0xf4,0x6a,0xfc,0xe4,0x2a,0x33,0x19, - 0xc4,0x4e,0x3e,0xb1,0x96,0xa3,0xcc,0xe5,0x29,0x77,0xf8,0xcb,0xea,0x55,0xf1,0x8f, - 0xdf,0x4a,0xe6,0xed,0xbe,0x58,0xcc,0x2c,0x4e,0x73,0xc6,0xa4,0x4c,0xe4,0x2c,0xbb, - 0xf9,0xcd,0x61,0x8e,0xb3,0x97,0xe7,0x8c,0xb3,0x35,0xdb,0x79,0xc7,0x78,0xce,0x73, - 0x8e,0xbb,0xcc,0xfe,0xe7,0x3e,0xbf,0x17,0xce,0xfe,0x6a,0xb3,0xa0,0xd9,0x5c,0xe7, - 0x42,0x2b,0xf9,0xd0,0x8a,0x36,0x33,0xa0,0x81,0xcc,0xe8,0x24,0x3b,0x1a,0xd1,0x72, - 0x8e,0x74,0xa3,0xf5,0x7c,0xe9,0x40,0x5b,0xfa,0xd1,0xfc,0x3b,0xf3,0x54,0x37,0x8d, - 0x65,0x4c,0xb3,0x65,0xcc,0xa0,0x1e,0x35,0xa1,0x4d,0xbd,0xe8,0x52,0xdb,0xc5,0xc2, - 0x9c,0xfe,0xb4,0xaa,0xf7,0x7c,0x65,0x4f,0x87,0xf5,0xd5,0x80,0x61,0x35,0xa5,0xef, - 0x4c,0xeb,0x1c,0x20,0x39,0xd4,0x9a,0xce,0x75,0x5c,0x6c,0x0d,0x6b,0x34,0xfb,0x3a, - 0xd3,0xb1,0x6e,0xf5,0xac,0x87,0x2d,0x0e,0x60,0x13,0x5b,0xd8,0xc8,0xe6,0x75,0x55, - 0x9c,0xcd,0xec,0x66,0x0f,0x3a,0xbd,0xb2,0x76,0xaa,0xb4,0xe9,0xbc,0x5c,0x63,0x5b, - 0xfb,0xda,0xd3,0xfe,0xae,0xb6,0x25,0xc9,0x6d,0x2b,0x53,0x59,0xd7,0xa4,0x0e,0xb7, - 0x9f,0xcb,0x3d,0x82,0x71,0x9b,0xfb,0xc8,0xa3,0x0d,0xb6,0xab,0xd7,0x0d,0x66,0x43, - 0xef,0x05,0xdd,0xf0,0x1e,0x9a,0xbc,0x2d,0x41,0xef,0x7a,0xdb,0x1b,0xd7,0xf4,0xaa, - 0xb4,0xbe,0xcb,0x1c,0x6d,0x72,0xdf,0xfb,0xdf,0xe7,0x5e,0x67,0xb5,0xc1,0x4d,0xf0, - 0x1e,0xbf,0xfb,0xd7,0x03,0x4f,0xf8,0xc7,0x02,0x8e,0x03,0x75,0x3b,0x5c,0xdc,0xc7, - 0x39,0xb8,0xc1,0x27,0xfe,0x61,0xc6,0x7e,0xfb,0xe2,0x18,0x27,0x31,0x19,0x24,0xcd, - 0xef,0x8e,0xa7,0x0e,0xb4,0xd0,0x5e,0xb8,0xc8,0xd5,0x2c,0x06,0x90,0xf7,0xfa,0xe4, - 0x23,0xaf,0xf8,0xc6,0x35,0xce,0x72,0x8f,0x4f,0xa7,0xe4,0xc7,0x8e,0x39,0xcd,0x69, - 0x77,0x73,0xfe,0x84,0xdb,0x5c,0xe1,0x71,0xb4,0x38,0xcc,0x77,0x5e,0xd2,0x3e,0xe4, - 0x9c,0xe3,0x40,0xe7,0xf9,0x28,0x86,0xfe,0xf3,0xa2,0x47,0x77,0x1d,0x48,0x27,0xb9, - 0xd2,0x33,0x9e,0x9d,0xa6,0x07,0xe7,0xe9,0x50,0xc7,0xb9,0xcf,0x9d,0x4e,0xf5,0xa0, - 0x33,0xfd,0xea,0x53,0xcf,0xba,0xd6,0xa7,0xa0,0x72,0x48,0x7b,0x3d,0xde,0x56,0x7f, - 0x39,0xd6,0xc7,0xbe,0xf4,0x23,0x84,0x1d,0xe2,0x27,0x3f,0x51,0xda,0xc5,0x25,0xf5, - 0x8f,0x67,0xfd,0x8e,0x28,0x87,0x3b,0xd7,0xe5,0x4e,0xf5,0x84,0xb4,0x7c,0x8c,0x66, - 0xef,0xba,0xd2,0xfb,0xca,0xee,0xb2,0xdf,0x7a,0xe5,0x18,0x37,0x27,0xc0,0x89,0xb0, - 0x76,0x93,0x77,0xfc,0xc0,0x0f,0xf7,0xe2,0xe0,0xc5,0x2e,0xf2,0xfe,0x62,0x1b,0xf1, - 0x71,0x77,0xf9,0xdf,0x13,0xd4,0x78,0xbe,0x3f,0x9e,0xed,0x91,0x87,0x61,0xc1,0xf5, - 0xd3,0x77,0xbc,0x3f,0x5d,0x85,0x14,0x53,0x7b,0xe5,0x53,0x3e,0x77,0xd2,0x9f,0xde, - 0xf0,0x9b,0x57,0x7c,0xe1,0x49,0xd8,0x7a,0x0f,0x86,0xde,0xf2,0x45,0x97,0x7d,0xe2, - 0x6d,0xef,0xee,0x9a,0x5f,0x1b,0x83,0xab,0x07,0xfc,0xdd,0x69,0x0f,0x74,0xd0,0xf7, - 0x5e,0xef,0xbf,0x47,0x7d,0xde,0x79,0x5f,0x7c,0xdf,0xcf,0xde,0xf8,0xa3,0x17,0xfe, - 0xf2,0x95,0x1f,0xfb,0x6d,0xbf,0x1e,0xf9,0xd1,0x1f,0x58,0xf2,0x7b,0xde,0x7c,0xe7, - 0x57,0x1f,0xf3,0xcf,0xc7,0xfe,0xe5,0xb5,0x9f,0x7b,0xeb,0x77,0x7f,0xe6,0xc7,0x67, - 0x60,0xf8,0x3d,0x7f,0x7d,0xf2,0x67,0x1f,0xfc,0xa8,0xbe,0xcf,0xf9,0x89,0x1e,0xfc, - 0x36,0xfe,0xa6,0x9f,0xee,0xf3,0xdf,0xfa,0xfa,0xd9,0x2f,0x70,0xf9,0x8f,0xff,0xe8, - 0xe5,0x37,0xff,0xb2,0x55,0xff,0x7f,0xba,0x27,0x6d,0x00,0x54,0x7f,0x83,0xb4,0x7f, - 0xf6,0xf7,0x7d,0xfe,0xd7,0x7e,0xf8,0x17,0x71,0xf9,0x46,0x70,0x94,0x57,0x80,0xe0, - 0x72,0x80,0x51,0xd7,0x7f,0x0a,0x98,0x7f,0x16,0xd8,0x80,0x0d,0x57,0x6f,0x10,0x38, - 0x81,0x12,0xb8,0x7d,0x49,0xb7,0x73,0x1c,0xf8,0x81,0x57,0x34,0x82,0x7e,0x57,0x7b, - 0x04,0x58,0x82,0x78,0xd5,0x81,0x82,0x77,0x82,0xfa,0x97,0x82,0xd0,0xf7,0x7e,0x20, - 0x68,0x73,0x22,0x18,0x83,0x24,0x58,0x83,0x26,0x18,0x7f,0x2e,0x78,0x83,0x2a,0xf8, - 0x82,0xcc,0x97,0x80,0x18,0xc8,0x70,0xee,0x17,0x80,0xd2,0x37,0x71,0x34,0x38,0x84, - 0xdc,0xd7,0x83,0x42,0x57,0x81,0x0c,0x18,0x84,0x40,0xd8,0x6f,0x21,0x37,0x7d,0x42, - 0xb8,0x80,0xd4,0x37,0x85,0x90,0xb7,0x78,0x28,0xb8,0x83,0x30,0x78,0x84,0xf0,0x17, - 0x82,0x58,0xb8,0x85,0x8c,0x97,0x85,0x3e,0xd8,0x82,0x52,0x98,0x2f,0x5e,0x58,0x85, - 0x9c,0x77,0x85,0x3a,0xf8,0x85,0x36,0xb8,0x86,0x38,0xd8,0x85,0x6a,0x78,0x86,0x00, - 0x18,0x87,0x02,0xd8,0x6c,0x46,0x38,0x87,0xe8,0xb7,0x82,0x8e,0x37,0x86,0x4e,0xb8, - 0x6a,0x70,0x58,0x86,0x1a,0x08,0x6f,0x76,0xf8,0x87,0x64,0x78,0x81,0x50,0x58,0x84, - 0x66,0x38,0x88,0x7c,0x78,0x02,0x0e,0xf8,0x6f,0x82,0x58,0x88,0x54,0x98,0x88,0x86, - 0xe8,0x70,0x8e,0x98,0x81,0x84,0x58,0x89,0xfe,0x96,0x70,0x94,0xd8,0x84,0x4c,0xf8, - 0xfe,0x84,0x84,0x77,0x88,0x7e,0xf8,0x88,0xb8,0xd7,0x86,0xa2,0xf7,0x83,0x9c,0xd8, - 0x89,0x72,0x78,0x87,0x3a,0xf7,0x86,0x96,0x78,0x89,0xa2,0x38,0x8a,0xc0,0xb7,0x8a, - 0x8a,0xb8,0x88,0xb2,0x98,0x6e,0x8c,0xa8,0x6f,0x76,0x17,0x81,0x35,0x74,0x7b,0x74, - 0x88,0x6c,0xb8,0xb8,0x82,0xa5,0x67,0x8b,0x1b,0xa8,0x89,0xad,0x88,0x84,0x79,0xa8, - 0x87,0x39,0x08,0x8a,0xa9,0x18,0x22,0xbb,0x48,0x84,0x93,0x38,0x8c,0xa1,0xa8,0x85, - 0xc6,0x68,0x7a,0x4b,0x48,0x8b,0x7d,0xc8,0x86,0xd2,0x38,0x8d,0xf7,0xc7,0x8a,0xca, - 0xe8,0x5e,0x93,0x87,0x89,0x0f,0xe8,0x8b,0xde,0x68,0x80,0xdd,0x96,0x6a,0x8d,0xa8, - 0x79,0x99,0xd7,0x8d,0x9f,0x67,0x85,0x51,0x88,0x88,0x0c,0xe1,0x59,0xd4,0x58,0x8d, - 0xd4,0x25,0x71,0x9d,0x77,0x8e,0x06,0xd1,0x6e,0xc8,0xf8,0x8c,0xc5,0x75,0x8f,0xb1, - 0x98,0x8f,0xcf,0x35,0x8f,0x69,0x58,0x8f,0xbe,0xf0,0x47,0xa5,0xd8,0x8f,0xde,0xb5, - 0x8e,0x9f,0x98,0x8d,0xb6,0xf5,0x8e,0xda,0x18,0x8e,0xc5,0x91,0x0c,0xa9,0xc7,0x82, - 0x0e,0x39,0x90,0x7b,0x98,0x90,0xca,0x35,0x91,0xf8,0x78,0x8c,0xfe,0xb8,0x8f,0x33, - 0x88,0x80,0x1b,0xf5,0x90,0xf0,0x18,0x90,0x06,0xf9,0x8d,0xe6,0xc8,0x7f,0x1a,0x79, - 0x5b,0x14,0x09,0x76,0x26,0x79,0x92,0x18,0x49,0x81,0xf7,0x95,0x59,0x28,0xd9,0x92, - 0xbd,0xe3,0x75,0xa4,0xf8,0x59,0xc1,0x18,0x88,0x34,0x09,0x61,0x48,0x04,0x91,0xb0, - 0x58,0x75,0xd9,0x46,0x90,0xde,0x97,0x62,0xda,0xc5,0x90,0x4a,0x18,0x94,0x42,0xfe, - 0xf9,0x93,0x62,0x38,0x63,0x3d,0x74,0x94,0x48,0x59,0x77,0x4a,0x09,0x93,0x6e,0xb8, - 0x65,0x20,0x04,0x92,0x67,0x77,0x78,0x1a,0x34,0x95,0x32,0x38,0x7c,0x17,0xc9,0x8f, - 0x68,0x48,0x8c,0x08,0x34,0x94,0x07,0x89,0x6f,0xca,0xb6,0x95,0xe5,0x18,0x05,0xf5, - 0x30,0x93,0xc1,0xb5,0x0d,0xa4,0x73,0x95,0x40,0xb2,0x96,0x81,0xf4,0x95,0x3c,0xb2, - 0x93,0x34,0xa4,0x8b,0x6d,0x89,0x24,0x74,0xc9,0x24,0x76,0xc9,0x3a,0x6f,0x09,0x46, - 0x78,0x49,0x25,0x7c,0x89,0x25,0x7e,0xc9,0x25,0x80,0x09,0x26,0x82,0x29,0x3f,0x7a, - 0xc9,0x96,0x86,0xe9,0x96,0x4b,0xb9,0x97,0x88,0x59,0x97,0x8c,0x79,0x97,0x8e,0x99, - 0x97,0x8a,0x79,0x98,0x92,0x99,0x98,0x4f,0x09,0x97,0x84,0x89,0x26,0x98,0xc9,0x26, - 0x9a,0x09,0x27,0x9c,0x49,0x27,0x9e,0xa9,0x40,0x90,0xd9,0x97,0xa2,0xf9,0x97,0xa4, - 0x19,0x98,0xa6,0x39,0x98,0xa8,0x59,0x46,0x68,0x47,0x8e,0xd8,0xc2,0x9a,0x53,0xe1, - 0x9a,0xaf,0x49,0x76,0x6a,0x23,0x9b,0x7b,0x07,0x3a,0xb5,0xd9,0x94,0xd8,0x83,0x9b, - 0x14,0xe7,0x3f,0xbb,0x19,0x40,0xba,0xe9,0x9b,0xbf,0x89,0x3f,0xc1,0x29,0x9c,0x04, - 0x44,0x9c,0x49,0xc9,0x41,0xc7,0x59,0x9c,0xc9,0xa9,0x9c,0xb9,0xf9,0x44,0xcd,0xb9, - 0x9c,0xcf,0x09,0x9d,0xce,0xb9,0x45,0xd3,0xc9,0x9b,0xd5,0x69,0x9d,0xb6,0x29,0x42, - 0xd9,0x39,0x9b,0xdb,0xc9,0x9d,0xb0,0x39,0x9c,0xdf,0x19,0x95,0x10,0x24,0x9e,0x55, - 0xe9,0x9d,0xe5,0xd9,0x9a,0xe4,0x89,0x9e,0xe2,0xc8,0x9c,0xeb,0x09,0x8c,0x2c,0xc0, - 0xe9,0x9e,0xb9,0xa8,0x96,0xf1,0x99,0x95,0xed,0x43,0x9f,0xd8,0xa8,0x3a,0xf7,0xc9, - 0x8d,0xed,0xa9,0x9f,0xd6,0x48,0x9b,0xfd,0x39,0x8b,0x11,0x03,0xa0,0xf3,0x16,0x2f, - 0x03,0x5a,0x6b,0x7b,0x64,0xa0,0x65,0x49,0x15,0x05,0x00,0x00,0x3b + 0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0x00, 0x02, 0x00, 0x02, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x21, 0xfe, 0x11, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69, + 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x00, 0x21, 0xf9, 0x04, 0x01, 0x0a, 0x00, 0x01, 0x00, + 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0xfe, 0x8c, 0x8f, 0xa9, 0xcb, + 0xed, 0x0f, 0x63, 0x04, 0xb4, 0xda, 0x8b, 0xb3, 0xde, 0xbc, 0xfb, 0x0f, 0x86, 0xe2, 0x48, 0x96, + 0xa4, 0x84, 0xa6, 0xea, 0xca, 0xb6, 0xee, 0x0b, 0xc7, 0xf2, 0x4c, 0x3f, 0xe6, 0x8d, 0xe7, 0xfa, + 0xce, 0xf7, 0xbe, 0x55, 0x0b, 0x0a, 0x87, 0xc4, 0xa2, 0xf1, 0x88, 0xfc, 0x29, 0x97, 0xcc, 0xa6, + 0xf3, 0x09, 0x44, 0x4a, 0xa7, 0xd4, 0xaa, 0xf5, 0xba, 0x80, 0x6a, 0xb7, 0xdc, 0xae, 0xb7, 0x82, + 0x0d, 0x8b, 0xc7, 0xe4, 0xb2, 0xe1, 0x8b, 0x4e, 0xab, 0xd7, 0x26, 0xb3, 0xfb, 0x0d, 0x8f, 0xa3, + 0xd8, 0xf4, 0xba, 0xdd, 0x2e, 0xcf, 0xeb, 0xf7, 0xe1, 0xbb, 0xff, 0x0f, 0xb8, 0xc5, 0x37, 0x48, + 0x58, 0x18, 0x13, 0x88, 0x98, 0xa8, 0xc8, 0x63, 0xd8, 0xe8, 0xf8, 0x88, 0xb0, 0x28, 0x39, 0x49, + 0x09, 0x02, 0x79, 0x89, 0x19, 0x57, 0xb9, 0xc9, 0xd9, 0x49, 0x91, 0x09, 0x1a, 0x6a, 0xe5, 0x49, + 0x5a, 0xaa, 0x28, 0x8a, 0x9a, 0x1a, 0x64, 0xca, 0xda, 0xfa, 0xa7, 0x0a, 0x1b, 0xab, 0xe2, 0x4a, + 0x5b, 0xbb, 0x26, 0x8b, 0x9b, 0xab, 0x60, 0xcb, 0xdb, 0xcb, 0xa5, 0x0b, 0x1c, 0xeb, 0x3b, 0x4c, + 0xec, 0x14, 0x7c, 0x0c, 0x5a, 0xac, 0xbc, 0xdc, 0x83, 0xec, 0xec, 0xc8, 0x1c, 0x2d, 0xdd, 0xf6, + 0x5c, 0xbd, 0x37, 0x8d, 0x9d, 0xfd, 0x61, 0xcd, 0x0d, 0xa7, 0xfd, 0x0d, 0x8e, 0xd1, 0x3d, 0x3e, + 0x16, 0x6e, 0x6e, 0x4e, 0x9e, 0x5e, 0x75, 0xce, 0x0e, 0xae, 0xfe, 0x6e, 0xd4, 0x2e, 0xaf, 0x0d, + 0x5f, 0x5f, 0x33, 0x8f, 0x8f, 0x6d, 0xbf, 0xff, 0x92, 0xef, 0x2f, 0xcd, 0x2f, 0xe0, 0xac, 0x7f, + 0x04, 0x8b, 0x09, 0x3c, 0x08, 0xa1, 0xa0, 0x42, 0x62, 0x08, 0x1b, 0xee, 0x5a, 0x08, 0xb1, 0x97, + 0xc3, 0x89, 0x11, 0x2b, 0xf2, 0x9a, 0xd8, 0xd0, 0xa2, 0x46, 0xfe, 0x57, 0x18, 0x0f, 0x6e, 0xfc, + 0xc8, 0xaa, 0x23, 0x3f, 0x90, 0x24, 0x49, 0x89, 0xdc, 0x57, 0x32, 0x25, 0xa7, 0x93, 0xf0, 0x54, + 0xba, 0xac, 0xc4, 0x52, 0xdd, 0xcb, 0x99, 0x8b, 0x62, 0x92, 0xa3, 0x89, 0x33, 0x91, 0xcd, 0x6e, + 0x39, 0x7b, 0xbe, 0xda, 0x59, 0xcd, 0xa7, 0xd0, 0x3b, 0x40, 0x9f, 0x0d, 0x3d, 0xca, 0xa6, 0x28, + 0x32, 0xa4, 0x4c, 0xd5, 0x28, 0x0d, 0xd6, 0x34, 0xaa, 0x97, 0xa7, 0xba, 0xa4, 0x5a, 0xfd, 0x45, + 0x55, 0xd6, 0xd5, 0xad, 0x4f, 0xb2, 0x6a, 0xe5, 0x0a, 0x56, 0x89, 0x57, 0x58, 0x61, 0xcb, 0xfe, + 0x18, 0x9b, 0xca, 0xac, 0xda, 0x1d, 0x68, 0x51, 0xad, 0x7d, 0x7b, 0xa3, 0x6d, 0x28, 0xb8, 0x74, + 0x4b, 0xc8, 0xcd, 0x54, 0x37, 0x6f, 0x88, 0xbb, 0x98, 0xf4, 0xfa, 0xed, 0xc0, 0xf7, 0xd2, 0xdf, + 0xc1, 0x19, 0x02, 0x3f, 0x22, 0x8c, 0xf8, 0x82, 0xe1, 0x46, 0x89, 0x1b, 0x03, 0x58, 0x6c, 0xc8, + 0x71, 0x62, 0xc8, 0x85, 0x24, 0x23, 0xa6, 0x4c, 0xc8, 0x32, 0x61, 0xcc, 0x83, 0x34, 0x0f, 0xe6, + 0x7c, 0xcd, 0xf3, 0x67, 0xd0, 0x72, 0x44, 0x8f, 0x26, 0xed, 0xcd, 0xb4, 0x5f, 0xd4, 0x9a, 0x54, + 0xeb, 0x65, 0x9d, 0xda, 0x75, 0x5d, 0xd8, 0x6f, 0x64, 0xe7, 0xa5, 0xed, 0xc6, 0xf6, 0x6c, 0xdc, + 0x65, 0x74, 0xd3, 0xe5, 0xdd, 0xbb, 0x16, 0x70, 0x18, 0xb6, 0x86, 0x97, 0x6b, 0x65, 0x9c, 0x06, + 0xc7, 0xe4, 0x58, 0x42, 0x32, 0xbf, 0x67, 0xea, 0xf9, 0x95, 0xe8, 0xd2, 0xa1, 0x9b, 0xac, 0x4e, + 0xa5, 0x14, 0xf6, 0x55, 0xd7, 0xb7, 0x27, 0xf1, 0xe4, 0x9d, 0x7b, 0xa7, 0xf0, 0xdf, 0x57, 0x92, + 0xb7, 0xbe, 0xe9, 0x7c, 0x3c, 0xf3, 0xea, 0x95, 0xb3, 0x6f, 0x2f, 0x1e, 0x26, 0xfc, 0x19, 0xe3, + 0xe7, 0xc7, 0x9f, 0x64, 0xdf, 0xbd, 0xfc, 0xfc, 0xf4, 0xfe, 0xd3, 0xf3, 0x3f, 0xe4, 0xdf, 0x7f, + 0x00, 0xee, 0x27, 0x60, 0x0b, 0xef, 0x15, 0x68, 0x20, 0x81, 0x08, 0xb2, 0x10, 0xe0, 0x82, 0x0c, + 0x2a, 0xe8, 0x60, 0x0a, 0x0d, 0x46, 0x28, 0x21, 0x84, 0x14, 0x4e, 0x60, 0xe1, 0x85, 0x36, 0x64, + 0xa8, 0x61, 0x03, 0x13, 0x76, 0xb8, 0x21, 0x25, 0x20, 0xce, 0xc1, 0xe1, 0x88, 0x09, 0x7c, 0x68, + 0x62, 0x16, 0x25, 0xa6, 0x78, 0xc6, 0x8a, 0x2c, 0xa2, 0xc8, 0x62, 0x24, 0x2e, 0xa6, 0x08, 0x63, + 0x8c, 0x2d, 0x8a, 0x68, 0x23, 0x03, 0x35, 0xda, 0xb8, 0x63, 0x8c, 0x3d, 0xbe, 0x38, 0xa3, 0x89, + 0x3f, 0xd2, 0x18, 0xe4, 0x88, 0x43, 0x0a, 0x59, 0x24, 0x88, 0x47, 0x1a, 0x99, 0x64, 0x87, 0x4b, + 0x2a, 0xd9, 0xa4, 0x86, 0x4f, 0x3a, 0x19, 0xe5, 0x85, 0x53, 0x4a, 0x59, 0x25, 0x85, 0x57, 0x5a, + 0x99, 0x65, 0x84, 0x5b, 0x6a, 0xd9, 0xa5, 0x83, 0x5f, 0x7a, 0x19, 0xe6, 0x82, 0x63, 0x8a, 0x59, + 0x26, 0x82, 0x67, 0x9a, 0x99, 0x66, 0x81, 0x6b, 0xaa, 0xd9, 0xa6, 0x80, 0x6f, 0xba, 0x19, 0xe7, + 0x7f, 0x73, 0xca, 0x59, 0x27, 0x7f, 0x77, 0xda, 0x99, 0x67, 0x7e, 0x7b, 0xea, 0xd9, 0xa7, 0x7d, + 0x7f, 0xfa, 0x19, 0xe8, 0x7c, 0x83, 0x0a, 0x5a, 0x28, 0x7c, 0x87, 0x1a, 0x9a, 0x68, 0x7b, 0x8b, + 0x2a, 0xda, 0xa8, 0x7a, 0x8f, 0x3a, 0x1a, 0xe9, 0x79, 0x93, 0x4a, 0x5a, 0x29, 0x79, 0x97, 0x5a, + 0x9a, 0x69, 0x78, 0x9b, 0x6a, 0xda, 0xa9, 0x77, 0x9f, 0x7a, 0x1a, 0xea, 0x76, 0xa3, 0x8a, 0x5a, + 0x2a, 0x76, 0xa7, 0x9a, 0x9a, 0x6a, 0x75, 0xab, 0xaa, 0xda, 0xaa, 0x74, 0xaf, 0xba, 0x1a, 0xeb, + 0x73, 0xb3, 0xca, 0x5a, 0x2b, 0x73, 0xb7, 0xda, 0x9a, 0x6b, 0x72, 0xbb, 0xea, 0xda, 0xab, 0x71, + 0xbf, 0xfa, 0x1a, 0xec, 0x70, 0xc3, 0x0a, 0x5b, 0xfe, 0x2c, 0x70, 0xc7, 0x1a, 0x9b, 0x2c, 0x6f, + 0xcb, 0x2a, 0xdb, 0x2c, 0x6e, 0xcf, 0x3a, 0x1b, 0x2d, 0x6d, 0xd3, 0x4a, 0x5b, 0x2d, 0x6c, 0xb3, + 0x7e, 0x42, 0x2c, 0x8e, 0x39, 0x3e, 0xe4, 0x6d, 0x11, 0x1e, 0x50, 0x1b, 0xee, 0xb7, 0x07, 0x5c, + 0x2a, 0x82, 0xb5, 0xd9, 0xb2, 0xf6, 0x28, 0x35, 0xa4, 0x5d, 0xab, 0x6e, 0xb9, 0xfd, 0xb9, 0xcb, + 0x19, 0xbc, 0xda, 0x06, 0xaa, 0xc3, 0xbb, 0xeb, 0xa2, 0x36, 0x28, 0x23, 0xf5, 0xee, 0xab, 0xaf, + 0xbc, 0xfd, 0x34, 0x83, 0x99, 0xbd, 0xec, 0xd6, 0x29, 0x16, 0x65, 0x06, 0xf3, 0x8b, 0x70, 0xc2, + 0x8b, 0x2d, 0x1c, 0x30, 0x7e, 0x32, 0x34, 0x01, 0x19, 0xc4, 0xa0, 0xdd, 0x69, 0x8c, 0x61, 0x16, + 0xff, 0x2b, 0xf0, 0x0a, 0x50, 0x68, 0x0c, 0xf0, 0xc5, 0x6d, 0x6a, 0x11, 0xd8, 0xc6, 0x05, 0x8f, + 0x4c, 0xf2, 0x5d, 0x26, 0x2b, 0x8c, 0x72, 0xca, 0x6d, 0xad, 0x5c, 0x71, 0xcb, 0x2e, 0x8f, 0x05, + 0xf3, 0xc3, 0x32, 0xcf, 0x9c, 0x55, 0xcd, 0x20, 0x77, 0x3c, 0x50, 0x17, 0x68, 0xe9, 0x5c, 0xf2, + 0xcd, 0x82, 0x78, 0x05, 0x34, 0x5f, 0x73, 0xa6, 0x41, 0x74, 0xc8, 0x1c, 0x4b, 0x4c, 0x1c, 0xd2, + 0x54, 0x15, 0xad, 0xb2, 0xd0, 0x3e, 0x3f, 0x05, 0xb5, 0x5c, 0x18, 0x3b, 0xa5, 0x54, 0xd5, 0x2f, + 0xc7, 0x99, 0x54, 0x51, 0x5a, 0xff, 0xcc, 0x75, 0xd7, 0x3b, 0x7d, 0x4d, 0x73, 0xc3, 0xb7, 0x8c, + 0xad, 0xf4, 0xc9, 0x3c, 0x3f, 0x78, 0x76, 0x4c, 0x64, 0x27, 0xbd, 0xb6, 0xc7, 0x74, 0xd8, 0xf4, + 0x76, 0xce, 0x7d, 0xd6, 0xe1, 0x76, 0xda, 0x2c, 0xc7, 0xcd, 0x76, 0xdb, 0x1d, 0xd5, 0xfd, 0x74, + 0xa1, 0x78, 0x8b, 0x04, 0x38, 0xd5, 0x89, 0x0e, 0x8e, 0x51, 0xe1, 0x59, 0x37, 0x8a, 0xb8, 0x43, + 0x8a, 0x7b, 0x1d, 0x69, 0xe3, 0x08, 0x3d, 0xfe, 0x0e, 0xd4, 0xa6, 0x92, 0x0b, 0x44, 0x39, 0xda, + 0x7c, 0x0f, 0xe8, 0x37, 0xe6, 0x7a, 0xc7, 0xbc, 0x39, 0xe7, 0x58, 0x7b, 0xf4, 0xb9, 0xcd, 0xa1, + 0x8b, 0xee, 0xb4, 0xe7, 0xa7, 0x43, 0xb9, 0x7a, 0xd3, 0x62, 0x8f, 0x54, 0xfa, 0xce, 0x4c, 0x4b, + 0x71, 0x79, 0x4b, 0xb1, 0x07, 0xdd, 0x3a, 0xea, 0x68, 0x04, 0x94, 0x39, 0xdd, 0xb1, 0xd6, 0x9e, + 0x4e, 0xef, 0x79, 0xe7, 0x3e, 0xf1, 0xdc, 0xf6, 0x08, 0xcf, 0xd2, 0xaf, 0xc0, 0xf3, 0x74, 0xbb, + 0xd1, 0xbd, 0x2e, 0x6f, 0x0d, 0xf2, 0x27, 0x1d, 0x0b, 0xbd, 0x51, 0xcd, 0x47, 0x4d, 0x3c, 0x7a, + 0xa3, 0xdf, 0x74, 0xbd, 0xd5, 0xc9, 0x56, 0x7f, 0x8c, 0xf4, 0x84, 0x37, 0x0b, 0x3e, 0x30, 0xe2, + 0xff, 0x1d, 0x6d, 0xf9, 0xb9, 0x9c, 0x9f, 0x78, 0xb5, 0xea, 0x7f, 0x95, 0x3d, 0x99, 0xf1, 0x0f, + 0xf1, 0x3e, 0x59, 0xdd, 0x6f, 0x3d, 0x3f, 0xfd, 0xc6, 0x07, 0x75, 0x3f, 0xd8, 0xf9, 0xeb, 0xff, + 0xba, 0xa5, 0xf4, 0xaf, 0x6c, 0xff, 0x13, 0x02, 0x1e, 0xac, 0x57, 0x40, 0x3c, 0x25, 0x50, 0x7b, + 0x9d, 0x33, 0xdf, 0x00, 0xe1, 0x36, 0xbb, 0xdc, 0x10, 0x45, 0x80, 0x0b, 0x04, 0x54, 0x05, 0xe7, + 0x75, 0x40, 0xa8, 0x3c, 0xd0, 0x6e, 0x17, 0x2c, 0x9e, 0x1f, 0xc2, 0xb7, 0xc1, 0xc0, 0x75, 0x50, + 0x77, 0xfb, 0x5b, 0x5f, 0x08, 0x0d, 0x37, 0x42, 0xd7, 0xfd, 0xc4, 0x84, 0x29, 0xa4, 0x54, 0x0b, + 0x5d, 0xa0, 0x13, 0x16, 0x46, 0xd0, 0x5c, 0x01, 0x58, 0xd8, 0x29, 0x70, 0xc1, 0x3e, 0x8a, 0xec, + 0xab, 0x26, 0xf0, 0x9b, 0xa1, 0xb9, 0x6c, 0xc8, 0x43, 0xfb, 0xbd, 0x90, 0x53, 0x43, 0xec, 0x5b, + 0x0c, 0x55, 0x91, 0x43, 0xc7, 0xed, 0xd0, 0x87, 0x78, 0x39, 0xe1, 0xe2, 0x8a, 0x28, 0x37, 0x26, + 0x0a, 0xc6, 0x89, 0x90, 0x83, 0x62, 0xfe, 0xcf, 0xa4, 0x78, 0x18, 0x2a, 0x56, 0x6e, 0x89, 0x56, + 0x2c, 0x0f, 0x16, 0x7d, 0xc4, 0xc5, 0x2e, 0xae, 0x47, 0x8c, 0xb4, 0x22, 0x23, 0x86, 0x00, 0x97, + 0xc4, 0x8c, 0x84, 0xd1, 0x8c, 0x06, 0xd4, 0xa2, 0xe6, 0xbe, 0xd8, 0x9c, 0xfa, 0x34, 0x91, 0x8d, + 0xc0, 0xa2, 0xa3, 0x03, 0xba, 0x33, 0x45, 0x3b, 0x22, 0x4b, 0x8f, 0x3a, 0x02, 0xcf, 0x1c, 0xe1, + 0x48, 0x24, 0x3e, 0xaa, 0xc8, 0x8f, 0x79, 0xf4, 0x8d, 0x5a, 0x4a, 0x83, 0xc7, 0x2c, 0x1a, 0xf2, + 0x90, 0xad, 0x49, 0x24, 0x63, 0x16, 0xc9, 0xc8, 0xd8, 0x10, 0x52, 0x91, 0x90, 0x0c, 0x0b, 0x22, + 0xb5, 0x03, 0x89, 0x4a, 0x9a, 0xe5, 0x92, 0x8e, 0xac, 0x8c, 0x26, 0x2d, 0xd9, 0xc8, 0x4e, 0x66, + 0xe6, 0x93, 0x60, 0xe1, 0xa4, 0x28, 0xf9, 0x40, 0xca, 0x52, 0x86, 0xf2, 0x94, 0xa1, 0x49, 0xe5, + 0x55, 0x4c, 0x39, 0xc9, 0xc8, 0xb8, 0xf2, 0x95, 0xab, 0x8c, 0xa5, 0x27, 0x67, 0x29, 0x15, 0x58, + 0xda, 0xb2, 0x33, 0xb8, 0xcc, 0x65, 0x2d, 0x77, 0x89, 0xca, 0x5e, 0x46, 0x45, 0x97, 0x72, 0x94, + 0xa5, 0x30, 0x99, 0x42, 0xcc, 0x03, 0x8d, 0xf2, 0x98, 0x48, 0x49, 0x26, 0xd4, 0x98, 0x89, 0xcc, + 0x5f, 0x02, 0x53, 0x0f, 0xd0, 0x6c, 0xa6, 0x34, 0x8b, 0xb9, 0xcc, 0x6a, 0xfa, 0xc4, 0x99, 0x45, + 0xd3, 0xe6, 0x50, 0xb8, 0xd9, 0x3c, 0x6f, 0x0a, 0x05, 0x9c, 0x82, 0xac, 0x90, 0x38, 0x73, 0x42, + 0x4e, 0x40, 0xd6, 0xe6, 0x9c, 0xe8, 0xbc, 0xa6, 0x32, 0x83, 0xc9, 0x4e, 0x9a, 0xa4, 0x53, 0x12, + 0xd0, 0x88, 0xa7, 0x3c, 0xdd, 0xd9, 0x4d, 0x7b, 0xce, 0x64, 0x9e, 0x41, 0xbc, 0xa5, 0x3e, 0x55, + 0xc2, 0xcf, 0x1b, 0x1a, 0xf3, 0x9f, 0x29, 0x09, 0xe8, 0x11, 0xfd, 0x49, 0x50, 0x92, 0x18, 0x14, + 0x11, 0xf5, 0x4c, 0x68, 0x49, 0xfe, 0x16, 0x1a, 0x88, 0x86, 0x3a, 0x14, 0x24, 0x10, 0x05, 0x84, + 0x44, 0x27, 0xba, 0x91, 0x3c, 0x2c, 0x67, 0xa0, 0x18, 0xd5, 0x88, 0x46, 0x91, 0xf3, 0xc8, 0x8e, + 0x66, 0xb4, 0xa2, 0x1f, 0x0c, 0xa9, 0x48, 0x2d, 0xf2, 0x51, 0xe7, 0x70, 0xf4, 0xa4, 0x10, 0x49, + 0x29, 0x75, 0x56, 0xca, 0x52, 0x85, 0xb8, 0x14, 0x93, 0x30, 0x8d, 0x29, 0x41, 0x66, 0xca, 0x4a, + 0x92, 0xda, 0x54, 0x1f, 0x38, 0xc5, 0x26, 0x2f, 0x77, 0xba, 0x10, 0x6a, 0xaa, 0x14, 0xa1, 0x40, + 0xfd, 0x87, 0x50, 0x5f, 0x4a, 0xd4, 0xa2, 0xe6, 0xa3, 0x95, 0x39, 0xc5, 0xa7, 0x52, 0xcf, 0xc1, + 0xd4, 0x69, 0xf6, 0xf4, 0xa9, 0xf2, 0x88, 0xaa, 0x4f, 0xe1, 0x49, 0xd5, 0xa5, 0x5a, 0x35, 0x9f, + 0x59, 0xd5, 0xea, 0x51, 0xa5, 0xaa, 0xd3, 0xae, 0x0e, 0x03, 0xab, 0x57, 0xdd, 0xaa, 0x58, 0xd1, + 0x41, 0x56, 0xae, 0x9e, 0xb5, 0x1d, 0x3f, 0x2d, 0xeb, 0x57, 0xd7, 0x0a, 0xd5, 0xb6, 0xaa, 0x15, + 0xae, 0x68, 0x4d, 0x6b, 0x39, 0x49, 0x44, 0xd7, 0xb8, 0xca, 0xf5, 0xae, 0x12, 0xc8, 0x2b, 0x3b, + 0x6a, 0x2a, 0xd0, 0xa4, 0xfa, 0x95, 0xa7, 0xd9, 0xe4, 0xeb, 0x19, 0x07, 0xfb, 0x0d, 0x93, 0xaa, + 0x53, 0x82, 0x88, 0x4d, 0xac, 0x62, 0xfb, 0x59, 0xd8, 0xc6, 0x4e, 0xe3, 0xa2, 0x90, 0xdd, 0xab, + 0x64, 0xa3, 0x41, 0xc9, 0xca, 0xda, 0xf5, 0xb2, 0xcb, 0xc8, 0xe4, 0x62, 0xcd, 0xc0, 0xd9, 0x6c, + 0x14, 0xf2, 0xa0, 0x91, 0x0d, 0xad, 0x32, 0xfa, 0xa2, 0x59, 0xb3, 0x9a, 0x76, 0xac, 0xa8, 0x25, + 0xad, 0x65, 0x57, 0xcb, 0xda, 0xd6, 0x46, 0xf4, 0xb1, 0xb0, 0x8d, 0xad, 0x6c, 0x57, 0x28, 0xd8, + 0xda, 0x5e, 0x64, 0x2e, 0xb3, 0x05, 0xac, 0x6e, 0x85, 0x23, 0x8a, 0xde, 0xe6, 0xf6, 0xb7, 0xb4, + 0x48, 0x0b, 0x6e, 0x4b, 0xfe, 0x4b, 0x5c, 0xe0, 0x1a, 0x37, 0x83, 0xc3, 0x4d, 0xee, 0x50, 0xdd, + 0xc2, 0x5c, 0xe4, 0x3a, 0x17, 0xa4, 0xc2, 0x28, 0xa1, 0x74, 0xa7, 0x8b, 0xd4, 0xea, 0x6e, 0xef, + 0xba, 0xd8, 0x6d, 0x2a, 0x6f, 0x77, 0x47, 0xdb, 0xee, 0x66, 0x57, 0x86, 0x58, 0xf1, 0xad, 0x78, + 0xdd, 0x8a, 0xc3, 0xf2, 0x36, 0xf7, 0xbc, 0x69, 0x94, 0x51, 0x57, 0xc2, 0xcb, 0x5e, 0xf4, 0x3a, + 0x83, 0x09, 0x94, 0x8d, 0x2f, 0x58, 0x29, 0x78, 0x16, 0xf8, 0xda, 0xd7, 0x8d, 0x46, 0x24, 0x98, + 0x79, 0xf7, 0x4b, 0x4f, 0x99, 0x2c, 0xa1, 0xbe, 0x00, 0xe6, 0x6f, 0x14, 0xf3, 0xfb, 0xdf, 0x02, + 0xbb, 0x96, 0x1b, 0xf4, 0xd5, 0xaf, 0x82, 0x03, 0x3b, 0x8e, 0x06, 0x27, 0xf8, 0xc1, 0x16, 0x15, + 0xb0, 0xc3, 0xd6, 0x4b, 0xe1, 0x0a, 0x07, 0x6f, 0xc0, 0x0e, 0xce, 0xb0, 0x86, 0xb9, 0x77, 0x61, + 0xee, 0x7a, 0xf8, 0xb8, 0xcc, 0x0b, 0xf1, 0x6b, 0x47, 0x2c, 0xdc, 0x08, 0x73, 0x78, 0xc2, 0x28, + 0xb6, 0x6e, 0x89, 0x11, 0x8c, 0xe1, 0x16, 0xbb, 0x98, 0xc1, 0x2b, 0x8e, 0xb1, 0x8c, 0x1b, 0x48, + 0x63, 0x13, 0x6f, 0xf6, 0xc6, 0x13, 0xdc, 0xb0, 0x8e, 0x55, 0xcb, 0xe3, 0xfa, 0x91, 0xd7, 0xbf, + 0x36, 0x0e, 0xf2, 0x17, 0xde, 0x21, 0xe1, 0x22, 0x1b, 0x79, 0x6a, 0x3e, 0x86, 0xb1, 0x88, 0x97, + 0x0c, 0xde, 0x26, 0xfb, 0x80, 0xc0, 0x50, 0xc6, 0x71, 0xf4, 0x6a, 0xfc, 0xe4, 0x2a, 0x33, 0x19, + 0xc4, 0x4e, 0x3e, 0xb1, 0x96, 0xa3, 0xcc, 0xe5, 0x29, 0x77, 0xf8, 0xcb, 0xea, 0x55, 0xf1, 0x8f, + 0xdf, 0x4a, 0xe6, 0xed, 0xbe, 0x58, 0xcc, 0x2c, 0x4e, 0x73, 0xc6, 0xa4, 0x4c, 0xe4, 0x2c, 0xbb, + 0xf9, 0xcd, 0x61, 0x8e, 0xb3, 0x97, 0xe7, 0x8c, 0xb3, 0x35, 0xdb, 0x79, 0xc7, 0x78, 0xce, 0x73, + 0x8e, 0xbb, 0xcc, 0xfe, 0xe7, 0x3e, 0xbf, 0x17, 0xce, 0xfe, 0x6a, 0xb3, 0xa0, 0xd9, 0x5c, 0xe7, + 0x42, 0x2b, 0xf9, 0xd0, 0x8a, 0x36, 0x33, 0xa0, 0x81, 0xcc, 0xe8, 0x24, 0x3b, 0x1a, 0xd1, 0x72, + 0x8e, 0x74, 0xa3, 0xf5, 0x7c, 0xe9, 0x40, 0x5b, 0xfa, 0xd1, 0xfc, 0x3b, 0xf3, 0x54, 0x37, 0x8d, + 0x65, 0x4c, 0xb3, 0x65, 0xcc, 0xa0, 0x1e, 0x35, 0xa1, 0x4d, 0xbd, 0xe8, 0x52, 0xdb, 0xc5, 0xc2, + 0x9c, 0xfe, 0xb4, 0xaa, 0xf7, 0x7c, 0x65, 0x4f, 0x87, 0xf5, 0xd5, 0x80, 0x61, 0x35, 0xa5, 0xef, + 0x4c, 0xeb, 0x1c, 0x20, 0x39, 0xd4, 0x9a, 0xce, 0x75, 0x5c, 0x6c, 0x0d, 0x6b, 0x34, 0xfb, 0x3a, + 0xd3, 0xb1, 0x6e, 0xf5, 0xac, 0x87, 0x2d, 0x0e, 0x60, 0x13, 0x5b, 0xd8, 0xc8, 0xe6, 0x75, 0x55, + 0x9c, 0xcd, 0xec, 0x66, 0x0f, 0x3a, 0xbd, 0xb2, 0x76, 0xaa, 0xb4, 0xe9, 0xbc, 0x5c, 0x63, 0x5b, + 0xfb, 0xda, 0xd3, 0xfe, 0xae, 0xb6, 0x25, 0xc9, 0x6d, 0x2b, 0x53, 0x59, 0xd7, 0xa4, 0x0e, 0xb7, + 0x9f, 0xcb, 0x3d, 0x82, 0x71, 0x9b, 0xfb, 0xc8, 0xa3, 0x0d, 0xb6, 0xab, 0xd7, 0x0d, 0x66, 0x43, + 0xef, 0x05, 0xdd, 0xf0, 0x1e, 0x9a, 0xbc, 0x2d, 0x41, 0xef, 0x7a, 0xdb, 0x1b, 0xd7, 0xf4, 0xaa, + 0xb4, 0xbe, 0xcb, 0x1c, 0x6d, 0x72, 0xdf, 0xfb, 0xdf, 0xe7, 0x5e, 0x67, 0xb5, 0xc1, 0x4d, 0xf0, + 0x1e, 0xbf, 0xfb, 0xd7, 0x03, 0x4f, 0xf8, 0xc7, 0x02, 0x8e, 0x03, 0x75, 0x3b, 0x5c, 0xdc, 0xc7, + 0x39, 0xb8, 0xc1, 0x27, 0xfe, 0x61, 0xc6, 0x7e, 0xfb, 0xe2, 0x18, 0x27, 0x31, 0x19, 0x24, 0xcd, + 0xef, 0x8e, 0xa7, 0x0e, 0xb4, 0xd0, 0x5e, 0xb8, 0xc8, 0xd5, 0x2c, 0x06, 0x90, 0xf7, 0xfa, 0xe4, + 0x23, 0xaf, 0xf8, 0xc6, 0x35, 0xce, 0x72, 0x8f, 0x4f, 0xa7, 0xe4, 0xc7, 0x8e, 0x39, 0xcd, 0x69, + 0x77, 0x73, 0xfe, 0x84, 0xdb, 0x5c, 0xe1, 0x71, 0xb4, 0x38, 0xcc, 0x77, 0x5e, 0xd2, 0x3e, 0xe4, + 0x9c, 0xe3, 0x40, 0xe7, 0xf9, 0x28, 0x86, 0xfe, 0xf3, 0xa2, 0x47, 0x77, 0x1d, 0x48, 0x27, 0xb9, + 0xd2, 0x33, 0x9e, 0x9d, 0xa6, 0x07, 0xe7, 0xe9, 0x50, 0xc7, 0xb9, 0xcf, 0x9d, 0x4e, 0xf5, 0xa0, + 0x33, 0xfd, 0xea, 0x53, 0xcf, 0xba, 0xd6, 0xa7, 0xa0, 0x72, 0x48, 0x7b, 0x3d, 0xde, 0x56, 0x7f, + 0x39, 0xd6, 0xc7, 0xbe, 0xf4, 0x23, 0x84, 0x1d, 0xe2, 0x27, 0x3f, 0x51, 0xda, 0xc5, 0x25, 0xf5, + 0x8f, 0x67, 0xfd, 0x8e, 0x28, 0x87, 0x3b, 0xd7, 0xe5, 0x4e, 0xf5, 0x84, 0xb4, 0x7c, 0x8c, 0x66, + 0xef, 0xba, 0xd2, 0xfb, 0xca, 0xee, 0xb2, 0xdf, 0x7a, 0xe5, 0x18, 0x37, 0x27, 0xc0, 0x89, 0xb0, + 0x76, 0x93, 0x77, 0xfc, 0xc0, 0x0f, 0xf7, 0xe2, 0xe0, 0xc5, 0x2e, 0xf2, 0xfe, 0x62, 0x1b, 0xf1, + 0x71, 0x77, 0xf9, 0xdf, 0x13, 0xd4, 0x78, 0xbe, 0x3f, 0x9e, 0xed, 0x91, 0x87, 0x61, 0xc1, 0xf5, + 0xd3, 0x77, 0xbc, 0x3f, 0x5d, 0x85, 0x14, 0x53, 0x7b, 0xe5, 0x53, 0x3e, 0x77, 0xd2, 0x9f, 0xde, + 0xf0, 0x9b, 0x57, 0x7c, 0xe1, 0x49, 0xd8, 0x7a, 0x0f, 0x86, 0xde, 0xf2, 0x45, 0x97, 0x7d, 0xe2, + 0x6d, 0xef, 0xee, 0x9a, 0x5f, 0x1b, 0x83, 0xab, 0x07, 0xfc, 0xdd, 0x69, 0x0f, 0x74, 0xd0, 0xf7, + 0x5e, 0xef, 0xbf, 0x47, 0x7d, 0xde, 0x79, 0x5f, 0x7c, 0xdf, 0xcf, 0xde, 0xf8, 0xa3, 0x17, 0xfe, + 0xf2, 0x95, 0x1f, 0xfb, 0x6d, 0xbf, 0x1e, 0xf9, 0xd1, 0x1f, 0x58, 0xf2, 0x7b, 0xde, 0x7c, 0xe7, + 0x57, 0x1f, 0xf3, 0xcf, 0xc7, 0xfe, 0xe5, 0xb5, 0x9f, 0x7b, 0xeb, 0x77, 0x7f, 0xe6, 0xc7, 0x67, + 0x60, 0xf8, 0x3d, 0x7f, 0x7d, 0xf2, 0x67, 0x1f, 0xfc, 0xa8, 0xbe, 0xcf, 0xf9, 0x89, 0x1e, 0xfc, + 0x36, 0xfe, 0xa6, 0x9f, 0xee, 0xf3, 0xdf, 0xfa, 0xfa, 0xd9, 0x2f, 0x70, 0xf9, 0x8f, 0xff, 0xe8, + 0xe5, 0x37, 0xff, 0xb2, 0x55, 0xff, 0x7f, 0xba, 0x27, 0x6d, 0x00, 0x54, 0x7f, 0x83, 0xb4, 0x7f, + 0xf6, 0xf7, 0x7d, 0xfe, 0xd7, 0x7e, 0xf8, 0x17, 0x71, 0xf9, 0x46, 0x70, 0x94, 0x57, 0x80, 0xe0, + 0x72, 0x80, 0x51, 0xd7, 0x7f, 0x0a, 0x98, 0x7f, 0x16, 0xd8, 0x80, 0x0d, 0x57, 0x6f, 0x10, 0x38, + 0x81, 0x12, 0xb8, 0x7d, 0x49, 0xb7, 0x73, 0x1c, 0xf8, 0x81, 0x57, 0x34, 0x82, 0x7e, 0x57, 0x7b, + 0x04, 0x58, 0x82, 0x78, 0xd5, 0x81, 0x82, 0x77, 0x82, 0xfa, 0x97, 0x82, 0xd0, 0xf7, 0x7e, 0x20, + 0x68, 0x73, 0x22, 0x18, 0x83, 0x24, 0x58, 0x83, 0x26, 0x18, 0x7f, 0x2e, 0x78, 0x83, 0x2a, 0xf8, + 0x82, 0xcc, 0x97, 0x80, 0x18, 0xc8, 0x70, 0xee, 0x17, 0x80, 0xd2, 0x37, 0x71, 0x34, 0x38, 0x84, + 0xdc, 0xd7, 0x83, 0x42, 0x57, 0x81, 0x0c, 0x18, 0x84, 0x40, 0xd8, 0x6f, 0x21, 0x37, 0x7d, 0x42, + 0xb8, 0x80, 0xd4, 0x37, 0x85, 0x90, 0xb7, 0x78, 0x28, 0xb8, 0x83, 0x30, 0x78, 0x84, 0xf0, 0x17, + 0x82, 0x58, 0xb8, 0x85, 0x8c, 0x97, 0x85, 0x3e, 0xd8, 0x82, 0x52, 0x98, 0x2f, 0x5e, 0x58, 0x85, + 0x9c, 0x77, 0x85, 0x3a, 0xf8, 0x85, 0x36, 0xb8, 0x86, 0x38, 0xd8, 0x85, 0x6a, 0x78, 0x86, 0x00, + 0x18, 0x87, 0x02, 0xd8, 0x6c, 0x46, 0x38, 0x87, 0xe8, 0xb7, 0x82, 0x8e, 0x37, 0x86, 0x4e, 0xb8, + 0x6a, 0x70, 0x58, 0x86, 0x1a, 0x08, 0x6f, 0x76, 0xf8, 0x87, 0x64, 0x78, 0x81, 0x50, 0x58, 0x84, + 0x66, 0x38, 0x88, 0x7c, 0x78, 0x02, 0x0e, 0xf8, 0x6f, 0x82, 0x58, 0x88, 0x54, 0x98, 0x88, 0x86, + 0xe8, 0x70, 0x8e, 0x98, 0x81, 0x84, 0x58, 0x89, 0xfe, 0x96, 0x70, 0x94, 0xd8, 0x84, 0x4c, 0xf8, + 0xfe, 0x84, 0x84, 0x77, 0x88, 0x7e, 0xf8, 0x88, 0xb8, 0xd7, 0x86, 0xa2, 0xf7, 0x83, 0x9c, 0xd8, + 0x89, 0x72, 0x78, 0x87, 0x3a, 0xf7, 0x86, 0x96, 0x78, 0x89, 0xa2, 0x38, 0x8a, 0xc0, 0xb7, 0x8a, + 0x8a, 0xb8, 0x88, 0xb2, 0x98, 0x6e, 0x8c, 0xa8, 0x6f, 0x76, 0x17, 0x81, 0x35, 0x74, 0x7b, 0x74, + 0x88, 0x6c, 0xb8, 0xb8, 0x82, 0xa5, 0x67, 0x8b, 0x1b, 0xa8, 0x89, 0xad, 0x88, 0x84, 0x79, 0xa8, + 0x87, 0x39, 0x08, 0x8a, 0xa9, 0x18, 0x22, 0xbb, 0x48, 0x84, 0x93, 0x38, 0x8c, 0xa1, 0xa8, 0x85, + 0xc6, 0x68, 0x7a, 0x4b, 0x48, 0x8b, 0x7d, 0xc8, 0x86, 0xd2, 0x38, 0x8d, 0xf7, 0xc7, 0x8a, 0xca, + 0xe8, 0x5e, 0x93, 0x87, 0x89, 0x0f, 0xe8, 0x8b, 0xde, 0x68, 0x80, 0xdd, 0x96, 0x6a, 0x8d, 0xa8, + 0x79, 0x99, 0xd7, 0x8d, 0x9f, 0x67, 0x85, 0x51, 0x88, 0x88, 0x0c, 0xe1, 0x59, 0xd4, 0x58, 0x8d, + 0xd4, 0x25, 0x71, 0x9d, 0x77, 0x8e, 0x06, 0xd1, 0x6e, 0xc8, 0xf8, 0x8c, 0xc5, 0x75, 0x8f, 0xb1, + 0x98, 0x8f, 0xcf, 0x35, 0x8f, 0x69, 0x58, 0x8f, 0xbe, 0xf0, 0x47, 0xa5, 0xd8, 0x8f, 0xde, 0xb5, + 0x8e, 0x9f, 0x98, 0x8d, 0xb6, 0xf5, 0x8e, 0xda, 0x18, 0x8e, 0xc5, 0x91, 0x0c, 0xa9, 0xc7, 0x82, + 0x0e, 0x39, 0x90, 0x7b, 0x98, 0x90, 0xca, 0x35, 0x91, 0xf8, 0x78, 0x8c, 0xfe, 0xb8, 0x8f, 0x33, + 0x88, 0x80, 0x1b, 0xf5, 0x90, 0xf0, 0x18, 0x90, 0x06, 0xf9, 0x8d, 0xe6, 0xc8, 0x7f, 0x1a, 0x79, + 0x5b, 0x14, 0x09, 0x76, 0x26, 0x79, 0x92, 0x18, 0x49, 0x81, 0xf7, 0x95, 0x59, 0x28, 0xd9, 0x92, + 0xbd, 0xe3, 0x75, 0xa4, 0xf8, 0x59, 0xc1, 0x18, 0x88, 0x34, 0x09, 0x61, 0x48, 0x04, 0x91, 0xb0, + 0x58, 0x75, 0xd9, 0x46, 0x90, 0xde, 0x97, 0x62, 0xda, 0xc5, 0x90, 0x4a, 0x18, 0x94, 0x42, 0xfe, + 0xf9, 0x93, 0x62, 0x38, 0x63, 0x3d, 0x74, 0x94, 0x48, 0x59, 0x77, 0x4a, 0x09, 0x93, 0x6e, 0xb8, + 0x65, 0x20, 0x04, 0x92, 0x67, 0x77, 0x78, 0x1a, 0x34, 0x95, 0x32, 0x38, 0x7c, 0x17, 0xc9, 0x8f, + 0x68, 0x48, 0x8c, 0x08, 0x34, 0x94, 0x07, 0x89, 0x6f, 0xca, 0xb6, 0x95, 0xe5, 0x18, 0x05, 0xf5, + 0x30, 0x93, 0xc1, 0xb5, 0x0d, 0xa4, 0x73, 0x95, 0x40, 0xb2, 0x96, 0x81, 0xf4, 0x95, 0x3c, 0xb2, + 0x93, 0x34, 0xa4, 0x8b, 0x6d, 0x89, 0x24, 0x74, 0xc9, 0x24, 0x76, 0xc9, 0x3a, 0x6f, 0x09, 0x46, + 0x78, 0x49, 0x25, 0x7c, 0x89, 0x25, 0x7e, 0xc9, 0x25, 0x80, 0x09, 0x26, 0x82, 0x29, 0x3f, 0x7a, + 0xc9, 0x96, 0x86, 0xe9, 0x96, 0x4b, 0xb9, 0x97, 0x88, 0x59, 0x97, 0x8c, 0x79, 0x97, 0x8e, 0x99, + 0x97, 0x8a, 0x79, 0x98, 0x92, 0x99, 0x98, 0x4f, 0x09, 0x97, 0x84, 0x89, 0x26, 0x98, 0xc9, 0x26, + 0x9a, 0x09, 0x27, 0x9c, 0x49, 0x27, 0x9e, 0xa9, 0x40, 0x90, 0xd9, 0x97, 0xa2, 0xf9, 0x97, 0xa4, + 0x19, 0x98, 0xa6, 0x39, 0x98, 0xa8, 0x59, 0x46, 0x68, 0x47, 0x8e, 0xd8, 0xc2, 0x9a, 0x53, 0xe1, + 0x9a, 0xaf, 0x49, 0x76, 0x6a, 0x23, 0x9b, 0x7b, 0x07, 0x3a, 0xb5, 0xd9, 0x94, 0xd8, 0x83, 0x9b, + 0x14, 0xe7, 0x3f, 0xbb, 0x19, 0x40, 0xba, 0xe9, 0x9b, 0xbf, 0x89, 0x3f, 0xc1, 0x29, 0x9c, 0x04, + 0x44, 0x9c, 0x49, 0xc9, 0x41, 0xc7, 0x59, 0x9c, 0xc9, 0xa9, 0x9c, 0xb9, 0xf9, 0x44, 0xcd, 0xb9, + 0x9c, 0xcf, 0x09, 0x9d, 0xce, 0xb9, 0x45, 0xd3, 0xc9, 0x9b, 0xd5, 0x69, 0x9d, 0xb6, 0x29, 0x42, + 0xd9, 0x39, 0x9b, 0xdb, 0xc9, 0x9d, 0xb0, 0x39, 0x9c, 0xdf, 0x19, 0x95, 0x10, 0x24, 0x9e, 0x55, + 0xe9, 0x9d, 0xe5, 0xd9, 0x9a, 0xe4, 0x89, 0x9e, 0xe2, 0xc8, 0x9c, 0xeb, 0x09, 0x8c, 0x2c, 0xc0, + 0xe9, 0x9e, 0xb9, 0xa8, 0x96, 0xf1, 0x99, 0x95, 0xed, 0x43, 0x9f, 0xd8, 0xa8, 0x3a, 0xf7, 0xc9, + 0x8d, 0xed, 0xa9, 0x9f, 0xd6, 0x48, 0x9b, 0xfd, 0x39, 0x8b, 0x11, 0x03, 0xa0, 0xf3, 0x16, 0x2f, + 0x03, 0x5a, 0x6b, 0x7b, 0x64, 0xa0, 0x65, 0x49, 0x15, 0x05, 0x00, 0x00, 0x3b }; diff --git a/src/utils/gui/images/textures/POITextures/Hotel.cpp b/src/utils/gui/images/textures/POITextures/Hotel.cpp index bc91d4481f26..410e8ffe91e7 100644 --- a/src/utils/gui/images/textures/POITextures/Hotel.cpp +++ b/src/utils/gui/images/textures/POITextures/Hotel.cpp @@ -20,147 +20,147 @@ /****************************************************************************/ const unsigned char POITexture_Hotel[] = { - 0x47,0x49,0x46,0x38,0x39,0x61,0x00,0x02,0x00,0x02,0x80,0x01,0x00,0x00,0x00,0x00, - 0xff,0xff,0xff,0x21,0xfe,0x11,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69, - 0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x00,0x21,0xf9,0x04,0x01,0x0a,0x00,0x01,0x00, - 0x2c,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x02,0x00,0x02,0xfe,0x8c,0x8f,0xa9,0xcb, - 0xed,0x0f,0xa3,0x9c,0xb4,0xda,0x8b,0xb3,0xde,0xbc,0xfb,0x0f,0x86,0xe2,0x48,0x96, - 0xe6,0x89,0xa6,0xea,0xca,0xb6,0xee,0x0b,0xc7,0xf2,0x4c,0xd7,0xf6,0x8d,0xe7,0xfa, - 0xce,0xf7,0xfe,0x0f,0x0c,0x0a,0x87,0xc4,0xa2,0xf1,0x88,0x4c,0x2a,0x97,0xcc,0xa6, - 0xf3,0x09,0x8d,0x4a,0xa7,0xd4,0xaa,0xf5,0x8a,0xcd,0x6a,0xb7,0xdc,0xae,0xf7,0x0b, - 0x0e,0x8b,0xc7,0xe4,0xb2,0xf9,0x8c,0x4e,0xab,0xd7,0xec,0xb6,0xfb,0x0d,0x8f,0xcb, - 0xe7,0xf4,0xba,0xfd,0x8e,0xcf,0xeb,0xf7,0xfc,0xbe,0xff,0x0f,0x18,0x28,0x38,0x48, - 0x58,0x68,0x78,0x88,0x98,0xa8,0xb8,0xc8,0xd8,0xe8,0xf8,0x08,0x19,0x29,0x39,0x49, - 0x59,0x69,0x79,0x89,0x99,0xa9,0xb9,0xc9,0xd9,0xe9,0xf9,0x09,0x1a,0x2a,0x3a,0x4a, - 0x5a,0x6a,0x7a,0x8a,0x9a,0xaa,0xba,0xca,0xda,0xea,0xfa,0x0a,0x1b,0x2b,0x3b,0x4b, - 0x5b,0x6b,0x7b,0x8b,0x9b,0xab,0xbb,0xcb,0xdb,0xeb,0xfb,0x0b,0x1c,0x2c,0x3c,0x4c, - 0x5c,0x6c,0x7c,0x8c,0x9c,0xac,0xbc,0xcc,0xdc,0xec,0xfc,0x0c,0x1d,0x2d,0x3d,0x4d, - 0x5d,0x6d,0x7d,0x8d,0x9d,0xad,0xbd,0xcd,0xdd,0xed,0xfd,0x0d,0x1e,0x2e,0x3e,0x4e, - 0x5e,0x6e,0x7e,0x8e,0x9e,0xae,0xbe,0xce,0xde,0xee,0xfe,0x0e,0x1f,0x2f,0x3f,0x4f, - 0x5f,0x6f,0x7f,0x8f,0x9f,0xaf,0xbf,0xcf,0xdf,0xef,0xff,0x0f,0x30,0xa0,0xc0,0x81, - 0x04,0x0b,0x1a,0x3c,0x88,0x30,0xa1,0xc2,0x85,0x0c,0x1b,0x3a,0x7c,0x08,0x31,0xa2, - 0xc4,0x89,0x14,0x2b,0x5a,0xbc,0x88,0x31,0xa3,0xc6,0xfe,0x8d,0x1c,0x3b,0x7a,0xfc, - 0x08,0x32,0xa4,0xc8,0x91,0x24,0x4b,0x9a,0x3c,0x89,0x32,0xa5,0xca,0x95,0x2c,0x5b, - 0xba,0x7c,0x09,0x33,0xa6,0xcc,0x99,0x34,0x6b,0xda,0xbc,0x89,0x33,0xa7,0xce,0x9d, - 0x3c,0x7b,0xfa,0xfc,0x09,0x34,0xa8,0xd0,0xa1,0x44,0x8b,0x1a,0x6d,0x07,0x20,0xa9, - 0xd2,0xa5,0x4c,0x9b,0x36,0x3d,0x2a,0xca,0xa9,0xd4,0xa9,0x54,0x93,0x42,0xd5,0x54, - 0x35,0xab,0x56,0xa5,0x57,0x2f,0x6d,0xfd,0xaa,0xb5,0xab,0x24,0xb0,0x64,0xb3,0x8a, - 0x85,0x54,0x36,0xed,0xd4,0xb3,0x8d,0xd4,0xba,0x7d,0xca,0x56,0xd1,0xdb,0xb9,0x4b, - 0xe3,0x26,0xa2,0x8b,0xd7,0x2e,0x22,0xbc,0x79,0xf5,0x12,0xe2,0xdb,0xd7,0xaf,0x20, - 0xc0,0x74,0x05,0x0f,0x22,0x3c,0xd7,0xf0,0x60,0xc4,0x6e,0x15,0x07,0x62,0xdc,0xd8, - 0xf1,0x1f,0xc8,0x6a,0x25,0x4f,0xa6,0x5c,0xd6,0xb2,0x1f,0xcc,0x99,0x35,0xf3,0xe1, - 0x4c,0xd6,0xf3,0x67,0xd0,0x5f,0x45,0xef,0x21,0x5d,0xda,0x74,0x1e,0xd4,0x5b,0x55, - 0xaf,0x66,0x6d,0xd6,0xf5,0x1d,0xd8,0xb1,0x65,0xd7,0xa1,0x5d,0xd5,0xb6,0x1d,0xdc, - 0x54,0x75,0xdf,0xe6,0x2d,0xd5,0x0a,0x58,0xdf,0x12,0x80,0x07,0x7f,0x42,0x98,0xf8, - 0x02,0xe3,0x4e,0x99,0x80,0x56,0x7e,0x80,0x39,0xdc,0x23,0xbc,0x89,0x4b,0x67,0x6a, - 0xe4,0xba,0xee,0xeb,0x75,0x87,0x70,0xef,0x6e,0xfa,0xbb,0xd5,0x20,0xe2,0xa7,0x6b, - 0x2e,0x0f,0xa4,0xfc,0xda,0xf3,0xe2,0x7d,0xa8,0xaf,0xad,0x18,0xfd,0x8e,0xf7,0xad, - 0x1d,0xcb,0xcf,0x41,0x7f,0xb8,0xe1,0xfb,0x36,0xfe,0xf2,0x77,0xf6,0xcb,0x1f,0x0d, - 0xfe,0x55,0xa6,0x57,0x80,0x32,0x0c,0x18,0x59,0x5c,0x06,0xbe,0x80,0x60,0x62,0x0a, - 0xb6,0x37,0x43,0x83,0x85,0xb1,0xb5,0x20,0x0b,0x12,0xf2,0x75,0x56,0x85,0x2a,0x5c, - 0x08,0x98,0x58,0x1a,0xa2,0xc0,0x61,0x72,0x57,0x7d,0x68,0x42,0x88,0x88,0x8d,0x08, - 0x61,0x0b,0x26,0x32,0x06,0x15,0x89,0x23,0xac,0x08,0xd9,0x51,0x2e,0x86,0x00,0x63, - 0x8c,0x46,0xcd,0xf8,0x41,0x8d,0x94,0xdd,0x98,0x62,0x0a,0x3a,0xee,0x48,0x14,0x8e, - 0x1d,0xfc,0x88,0x59,0x90,0x3d,0x96,0x48,0x64,0x91,0x31,0x24,0xc9,0xe4,0x7b,0x51, - 0x08,0xa9,0x41,0x93,0x40,0xba,0x20,0x65,0x95,0xf9,0x2d,0x01,0x65,0x06,0x56,0xb2, - 0x68,0xe1,0x96,0x5e,0xd2,0x47,0xdd,0x91,0x2f,0x7e,0x29,0xa2,0x8f,0x64,0x9e,0xe9, - 0xa4,0x10,0x59,0x5a,0x80,0x66,0x87,0x66,0xb6,0x09,0xa7,0x98,0x3a,0xac,0x59,0x41, - 0x9c,0x81,0x95,0x60,0x67,0x9e,0xdf,0xb9,0x27,0x67,0x8e,0x7a,0xbe,0x05,0xe2,0x9f, - 0x82,0x32,0x37,0x5f,0x9f,0x1e,0x0c,0x9a,0xe0,0x98,0x88,0x2e,0x8a,0x1b,0x7e,0x86, - 0x72,0xc0,0x28,0x81,0x8a,0x46,0x4a,0x29,0x69,0x37,0xd0,0x59,0x5c,0xa5,0xfa,0x4d, - 0xaa,0x69,0xa7,0x36,0x46,0xf8,0x68,0x94,0x9e,0xa6,0x26,0xc2,0xa8,0xa6,0x7e,0x0a, - 0x03,0xa6,0x10,0x9c,0x1a,0x56,0xa9,0xac,0xbe,0xea,0x26,0x83,0xa1,0x62,0x00,0x6b, - 0x6e,0xae,0xd6,0x8a,0x2b,0xa0,0x54,0xce,0x7a,0x41,0xae,0xeb,0x81,0xe0,0x6b,0xb0, - 0x69,0xed,0xba,0x27,0x8d,0xc2,0x9a,0x77,0xfe,0xe8,0xb1,0xca,0xd6,0xb7,0x21,0xaf, - 0x75,0x2e,0x0b,0x5e,0xb2,0xd0,0x4e,0x7b,0xdc,0x9b,0xdc,0xdd,0x3a,0xad,0xb1,0xd4, - 0x6e,0x8b,0x2c,0x09,0xaa,0x32,0xc0,0x2d,0x00,0xda,0x86,0x4b,0x6e,0xa0,0xc5,0xfa, - 0xc9,0x2d,0xb0,0xe4,0xae,0x2b,0x2e,0x92,0xe7,0x4a,0xbb,0xad,0xba,0xec,0xae,0x8b, - 0xa7,0xb3,0x99,0x86,0x2b,0xef,0xbc,0xe5,0x72,0x2a,0x5d,0xbe,0xe9,0xc2,0xab,0x2f, - 0xbe,0xd8,0x6a,0x87,0xae,0xc0,0x43,0x06,0xcc,0xee,0xc0,0xfd,0x02,0xfc,0xef,0xc1, - 0x08,0xd3,0xeb,0xef,0xc2,0x0e,0xef,0x3b,0xf1,0xc3,0x06,0x57,0x2c,0x31,0xa4,0xf3, - 0x32,0x6c,0x71,0xbc,0x1c,0x1b,0x57,0x30,0xc5,0x1b,0x74,0xbc,0x31,0xc6,0x84,0x7e, - 0x4c,0x2d,0xca,0x24,0x43,0x6b,0x32,0xc8,0x2a,0xb3,0xdc,0xf2,0xca,0xd9,0x8e,0x6c, - 0xef,0x03,0x01,0xbf,0x2c,0xb3,0xb2,0x34,0xbf,0x2b,0x6a,0xc9,0x1a,0xe7,0x0c,0x31, - 0xad,0x35,0x3b,0x70,0x73,0xcc,0x40,0xc3,0xdc,0xeb,0xd0,0x0d,0x20,0x6c,0xf4,0xd1, - 0xcb,0x0a,0xcd,0xb3,0x96,0x45,0xef,0xec,0xb4,0xc8,0x13,0x7c,0x8b,0x00,0xd3,0x3f, - 0x57,0x7d,0xf1,0xd5,0x4a,0x83,0x3b,0x75,0xcf,0x5c,0x77,0x1d,0x01,0xd6,0xd1,0x85, - 0x2d,0xf5,0xd8,0x56,0xaf,0xfa,0xf5,0x72,0x68,0x43,0xad,0x36,0xd9,0x44,0xb7,0xad, - 0x80,0xd6,0x54,0xc7,0xed,0xf1,0xbd,0xd7,0x36,0x3d,0xf3,0xdd,0x78,0xa7,0xac,0x37, - 0xc1,0x5b,0x27,0x3c,0xf8,0xdf,0x80,0xb3,0x1d,0x35,0xdc,0x84,0xfb,0x6d,0x38,0xd2, - 0x36,0xd3,0x9d,0x80,0xdd,0x62,0x37,0xfe,0x7e,0xf8,0xdc,0x89,0x27,0xad,0x2f,0xdf, - 0x94,0xe7,0x5a,0x36,0xe4,0x59,0x67,0xae,0xf9,0xe6,0xb8,0x22,0xbe,0x77,0xe1,0x72, - 0x63,0x2e,0x7a,0xe5,0x6e,0x5f,0xce,0x26,0xe8,0xa6,0xa7,0x7e,0xec,0xe3,0xac,0xb7, - 0xbe,0x38,0xe3,0xb0,0xc7,0xbe,0xb4,0xe7,0x9f,0xd7,0x3e,0xf9,0xed,0x3a,0xe7,0x3e, - 0xfb,0xb3,0xbc,0xa7,0xed,0xbb,0xe3,0x91,0xeb,0x7e,0xf6,0xf0,0x8a,0x17,0x8f,0xfb, - 0xea,0xa5,0xbf,0xde,0x37,0xf4,0xcc,0x73,0xee,0xbc,0xe0,0xd2,0x3f,0x8d,0xf3,0xf4, - 0xaf,0x82,0x1d,0xbc,0xf0,0xa7,0xa3,0xae,0x7d,0xf3,0xbb,0x3f,0x7f,0xbd,0xf8,0xb6, - 0x87,0x3f,0x7a,0xdd,0xc8,0x27,0xdf,0x70,0xe8,0xe8,0x8f,0x5a,0x7d,0xc6,0xee,0xd7, - 0x1a,0xf1,0xfb,0xd4,0x8f,0x6f,0xfd,0xfc,0xb0,0xd6,0x6f,0x3f,0xfd,0xc7,0x77,0xef, - 0xbd,0xe8,0xe9,0xaf,0x7f,0x95,0xfa,0x1f,0xf9,0x06,0x68,0xaa,0x71,0x11,0xf0,0x7e, - 0x06,0x30,0x9b,0xfa,0x54,0x57,0xbe,0x05,0x7a,0xca,0x80,0xf9,0x43,0xe0,0x04,0x15, - 0x28,0x41,0xff,0x35,0x70,0x7d,0x14,0x34,0x9f,0x05,0x33,0x38,0x28,0xfc,0xc9,0x2f, - 0x7b,0xac,0xe2,0x17,0x08,0x4b,0xc8,0xbe,0x0a,0x92,0x30,0x81,0x0a,0x3b,0x21,0x0a, - 0x03,0xe0,0xc0,0xf8,0xf9,0xca,0x84,0x2e,0x64,0x21,0x0c,0x39,0xf8,0xc0,0x60,0x79, - 0xab,0x86,0x1a,0x8c,0xa1,0x0c,0x35,0x88,0x41,0x1e,0xc2,0x6f,0x83,0x00,0x24,0x5e, - 0xfa,0x68,0x28,0xc4,0x4e,0x11,0xf1,0x80,0xfc,0x3b,0x95,0xbb,0x92,0xe8,0xc4,0x1b, - 0x16,0xd1,0x88,0xdb,0xab,0x17,0xfe,0x14,0xa3,0xe8,0x43,0xee,0xed,0xef,0x89,0x57, - 0xbc,0x60,0x16,0xb5,0xf8,0xc2,0x1d,0x76,0x71,0x88,0x5f,0x04,0xe3,0x10,0xb9,0x38, - 0x46,0x4d,0x49,0x91,0x89,0x2d,0x54,0xa3,0xb9,0xd2,0xa8,0xc4,0x32,0x9a,0xd1,0x8d, - 0x27,0x80,0x23,0xfc,0xe4,0x38,0xc7,0x48,0x35,0xcb,0x8e,0x6a,0xc4,0x63,0x1e,0x11, - 0xb5,0x02,0x3e,0xc6,0x11,0x87,0xa4,0xd3,0x63,0x20,0x05,0x59,0x40,0x3f,0xfe,0x51, - 0x4f,0x2a,0x42,0x24,0xa5,0xd6,0xa8,0xc2,0x3a,0x1a,0xf2,0x90,0x8e,0x34,0x9c,0xac, - 0x00,0xd9,0xc8,0x4a,0xfe,0x2d,0x55,0x21,0x24,0x96,0x26,0xe3,0xb6,0xa4,0x3f,0x71, - 0xf2,0x93,0xa0,0x0c,0xa5,0x9d,0x4c,0x49,0xca,0xb1,0x81,0x0a,0x4e,0x07,0x4a,0xa5, - 0xda,0x04,0x84,0x26,0x58,0xba,0x92,0x6b,0x35,0x38,0x53,0x2d,0x67,0x49,0xcb,0xfe, - 0x6c,0x49,0x97,0xb8,0x74,0x1a,0x0e,0xac,0x74,0xa9,0x5e,0xfa,0xf2,0x97,0x4c,0x72, - 0x94,0x30,0x81,0x56,0x28,0x1d,0xcd,0xe9,0x98,0xc8,0x4c,0xa6,0x89,0x78,0xc0,0xcc, - 0x66,0x42,0x33,0x44,0x3d,0x88,0x66,0xce,0xd2,0xd3,0xa0,0x1f,0x58,0x53,0x66,0x6a, - 0xba,0x12,0x36,0xb7,0xd9,0x31,0x22,0xa8,0xc7,0x3b,0xe0,0x0c,0x67,0x11,0x22,0xc9, - 0xa7,0x72,0x3e,0x2c,0x09,0xd5,0x09,0x93,0x3a,0x25,0x87,0x84,0xe7,0x60,0xe9,0x9d, - 0xf0,0x9c,0x27,0x86,0x9c,0x40,0xcf,0x7a,0x42,0x61,0x53,0x52,0xc8,0xe7,0xdb,0x62, - 0xe1,0x4f,0xd7,0x41,0xc7,0x0d,0x8a,0x1c,0x28,0x3e,0x09,0x69,0xd0,0x7e,0x22,0x34, - 0xa1,0xfb,0x5c,0x28,0x43,0xfe,0x0f,0x3a,0xc5,0x87,0x76,0xa1,0xa0,0x12,0x8d,0xa7, - 0x43,0x2b,0xaa,0x04,0x8a,0x62,0xf4,0x9c,0x17,0xdd,0xa8,0x3b,0xd9,0xe8,0xd1,0x2f, - 0x68,0x34,0xa4,0xe4,0xe9,0x28,0x49,0xc9,0x19,0xd1,0x93,0x52,0x61,0xa4,0x2a,0xad, - 0xa6,0x49,0x5b,0xaa,0xcd,0x97,0xc2,0xd4,0xa5,0x29,0x9d,0x29,0x72,0x64,0x6a,0xd3, - 0x65,0xd6,0x34,0xa7,0xce,0xc1,0x29,0x4f,0x83,0xb9,0xd3,0x9f,0xb2,0xd3,0xa7,0x42, - 0x95,0x25,0x48,0x8b,0xfa,0x24,0x96,0x22,0x15,0x95,0x01,0x6d,0xaa,0x53,0x9f,0x0a, - 0xd5,0xa8,0x4a,0x75,0xaa,0x54,0xad,0xaa,0x55,0xaf,0x8a,0xd5,0xac,0x6a,0x75,0xab, - 0x5c,0xed,0xaa,0x57,0xbf,0x0a,0xd6,0xb0,0x8a,0x75,0xac,0x64,0x2d,0xab,0x59,0xcf, - 0x8a,0xd6,0xb4,0xaa,0x75,0xad,0x6c,0x6d,0xab,0x5b,0xdf,0x0a,0xd7,0xb8,0xca,0x75, - 0xae,0x74,0xad,0xab,0x5d,0xef,0x8a,0xd7,0xbc,0xea,0x75,0xaf,0x7c,0xed,0xab,0x5f, - 0xff,0x0a,0xd8,0xc0,0x0a,0x76,0xb0,0x84,0x2d,0xac,0x61,0x0f,0x8b,0xd8,0xc4,0x2a, - 0x76,0xb1,0x8c,0x6d,0xac,0x63,0x1f,0x0b,0xd9,0xc8,0x4a,0x76,0xb2,0x94,0xad,0xac, - 0x65,0x2f,0x8b,0xd9,0xcc,0x6a,0x76,0xb3,0x9c,0xed,0xac,0x67,0x3f,0x0b,0xda,0xd0, - 0x8a,0x76,0xb4,0xa4,0x2d,0xad,0x69,0x4f,0x8b,0xda,0xd4,0xaa,0x76,0xb5,0xac,0x6d, - 0xad,0x6b,0x5f,0x0b,0xdb,0xd8,0xca,0x76,0xb6,0xb4,0xad,0xad,0x6d,0x6f,0x8b,0xdb, - 0xdc,0xea,0x76,0xb7,0xbc,0xed,0xad,0x6f,0x7f,0x0b,0xdc,0xe0,0x0a,0x77,0xb8,0xc4, - 0x2d,0xae,0x71,0x8f,0xfe,0x8b,0xdc,0xe4,0x2a,0x77,0xb9,0xcc,0x6d,0xae,0x73,0x9f, - 0x0b,0xdd,0xe8,0x4a,0x77,0xba,0xd4,0xad,0xae,0x75,0xaf,0x3b,0xc3,0xa5,0xb6,0x71, - 0x92,0xda,0x0d,0x22,0x77,0xbb,0x1b,0xb2,0x02,0x82,0xd7,0xbb,0x8c,0x1a,0x2f,0x79, - 0x17,0x65,0xde,0x26,0xa2,0x37,0xbd,0x2b,0xcc,0x13,0x7b,0xdb,0x7b,0xca,0xf7,0x46, - 0x50,0x94,0xf2,0x3d,0xdf,0x7a,0xeb,0x4b,0xc5,0x47,0xe2,0x37,0xbf,0xdf,0xdd,0x2f, - 0x05,0x6c,0xe8,0xdf,0x00,0x8a,0x37,0xc0,0x02,0xd6,0x2f,0x81,0xff,0x7b,0xc6,0x03, - 0x07,0x6e,0xc0,0x0a,0xee,0xdc,0x05,0x1b,0xec,0x60,0x25,0x42,0x38,0xc2,0x74,0x9c, - 0xb0,0xe5,0x24,0x6c,0xe1,0x0b,0x57,0x38,0xc3,0x3f,0x2c,0x2f,0x87,0x81,0x87,0xe1, - 0x0f,0xe7,0x70,0xc3,0x22,0x4e,0x21,0x83,0x4b,0x6c,0x62,0x03,0xa3,0x38,0xc5,0xfd, - 0x45,0x31,0x80,0x57,0x0c,0xc9,0x13,0xaf,0xf8,0xc5,0x33,0x4e,0x30,0x8c,0x69,0xec, - 0x62,0x1b,0xd7,0xf8,0xc1,0x30,0x8e,0xb1,0x8a,0x6f,0xac,0xe3,0x1c,0xf3,0x18,0xc8, - 0x43,0xde,0x71,0x88,0x89,0x7c,0x64,0x23,0x6b,0x87,0xa8,0x36,0x85,0x50,0x50,0x09, - 0x5c,0xac,0x27,0x07,0xf8,0x5c,0xe8,0x54,0x72,0x3b,0x59,0xcc,0x9a,0x1e,0x77,0x18, - 0x35,0x23,0xa6,0x8d,0x96,0x17,0x29,0xcf,0x2e,0x5b,0xea,0xcb,0x60,0x9e,0xd2,0x96, - 0x4f,0x44,0x66,0xd9,0x8d,0xb9,0x90,0xa8,0x4a,0x33,0x88,0xcd,0x8c,0xe0,0x3b,0xb9, - 0x99,0x76,0x13,0x9a,0xb3,0x9d,0xef,0x8c,0xe7,0x3c,0xeb,0x79,0xcf,0x7c,0xee,0xb3, - 0x9f,0xff,0x0c,0x8c,0xe8,0x40,0x0b,0x7a,0xd0,0x84,0x2e,0xb4,0xa1,0x0f,0x8d,0xe8, - 0x44,0x2b,0x7a,0xd1,0x8c,0x6e,0xb4,0xa3,0x1f,0x0d,0xe9,0x48,0x4b,0x7a,0xd2,0x94, - 0xae,0xb4,0xa5,0x2f,0x8d,0xe9,0x4c,0x6b,0x7a,0xd3,0x9c,0xee,0xb4,0xa7,0x3f,0x0d, - 0xea,0x50,0x8b,0x7a,0xd4,0xa4,0x2e,0xb5,0xa9,0x4f,0x8d,0xea,0x54,0xab,0x7a,0xd5, - 0xac,0x6e,0xb5,0xab,0x5f,0x0d,0xeb,0x58,0xcb,0x7a,0xd6,0xb4,0xae,0xb5,0xad,0x6f, - 0x8d,0xeb,0x5c,0xeb,0x7a,0xd7,0xbc,0xee,0xb5,0xaf,0x7f,0x0d,0xec,0x60,0x0b,0x7b, - 0xd8,0xc4,0x2e,0xb6,0xb1,0x8f,0x8d,0xec,0x64,0x2b,0x7b,0xd9,0xcc,0x6e,0xb6,0xb3, - 0x9f,0x0d,0xed,0x68,0x4b,0x7b,0xda,0xd4,0xae,0xb6,0xb5,0xaf,0x8d,0xed,0x6c,0x6b, - 0x7b,0xdb,0xdc,0xee,0xb6,0xb7,0xbf,0x0d,0xee,0x70,0x8b,0x7b,0xdc,0x22,0x29,0x00, - 0x00,0x3b + 0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0x00, 0x02, 0x00, 0x02, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x21, 0xfe, 0x11, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69, + 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x00, 0x21, 0xf9, 0x04, 0x01, 0x0a, 0x00, 0x01, 0x00, + 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0xfe, 0x8c, 0x8f, 0xa9, 0xcb, + 0xed, 0x0f, 0xa3, 0x9c, 0xb4, 0xda, 0x8b, 0xb3, 0xde, 0xbc, 0xfb, 0x0f, 0x86, 0xe2, 0x48, 0x96, + 0xe6, 0x89, 0xa6, 0xea, 0xca, 0xb6, 0xee, 0x0b, 0xc7, 0xf2, 0x4c, 0xd7, 0xf6, 0x8d, 0xe7, 0xfa, + 0xce, 0xf7, 0xfe, 0x0f, 0x0c, 0x0a, 0x87, 0xc4, 0xa2, 0xf1, 0x88, 0x4c, 0x2a, 0x97, 0xcc, 0xa6, + 0xf3, 0x09, 0x8d, 0x4a, 0xa7, 0xd4, 0xaa, 0xf5, 0x8a, 0xcd, 0x6a, 0xb7, 0xdc, 0xae, 0xf7, 0x0b, + 0x0e, 0x8b, 0xc7, 0xe4, 0xb2, 0xf9, 0x8c, 0x4e, 0xab, 0xd7, 0xec, 0xb6, 0xfb, 0x0d, 0x8f, 0xcb, + 0xe7, 0xf4, 0xba, 0xfd, 0x8e, 0xcf, 0xeb, 0xf7, 0xfc, 0xbe, 0xff, 0x0f, 0x18, 0x28, 0x38, 0x48, + 0x58, 0x68, 0x78, 0x88, 0x98, 0xa8, 0xb8, 0xc8, 0xd8, 0xe8, 0xf8, 0x08, 0x19, 0x29, 0x39, 0x49, + 0x59, 0x69, 0x79, 0x89, 0x99, 0xa9, 0xb9, 0xc9, 0xd9, 0xe9, 0xf9, 0x09, 0x1a, 0x2a, 0x3a, 0x4a, + 0x5a, 0x6a, 0x7a, 0x8a, 0x9a, 0xaa, 0xba, 0xca, 0xda, 0xea, 0xfa, 0x0a, 0x1b, 0x2b, 0x3b, 0x4b, + 0x5b, 0x6b, 0x7b, 0x8b, 0x9b, 0xab, 0xbb, 0xcb, 0xdb, 0xeb, 0xfb, 0x0b, 0x1c, 0x2c, 0x3c, 0x4c, + 0x5c, 0x6c, 0x7c, 0x8c, 0x9c, 0xac, 0xbc, 0xcc, 0xdc, 0xec, 0xfc, 0x0c, 0x1d, 0x2d, 0x3d, 0x4d, + 0x5d, 0x6d, 0x7d, 0x8d, 0x9d, 0xad, 0xbd, 0xcd, 0xdd, 0xed, 0xfd, 0x0d, 0x1e, 0x2e, 0x3e, 0x4e, + 0x5e, 0x6e, 0x7e, 0x8e, 0x9e, 0xae, 0xbe, 0xce, 0xde, 0xee, 0xfe, 0x0e, 0x1f, 0x2f, 0x3f, 0x4f, + 0x5f, 0x6f, 0x7f, 0x8f, 0x9f, 0xaf, 0xbf, 0xcf, 0xdf, 0xef, 0xff, 0x0f, 0x30, 0xa0, 0xc0, 0x81, + 0x04, 0x0b, 0x1a, 0x3c, 0x88, 0x30, 0xa1, 0xc2, 0x85, 0x0c, 0x1b, 0x3a, 0x7c, 0x08, 0x31, 0xa2, + 0xc4, 0x89, 0x14, 0x2b, 0x5a, 0xbc, 0x88, 0x31, 0xa3, 0xc6, 0xfe, 0x8d, 0x1c, 0x3b, 0x7a, 0xfc, + 0x08, 0x32, 0xa4, 0xc8, 0x91, 0x24, 0x4b, 0x9a, 0x3c, 0x89, 0x32, 0xa5, 0xca, 0x95, 0x2c, 0x5b, + 0xba, 0x7c, 0x09, 0x33, 0xa6, 0xcc, 0x99, 0x34, 0x6b, 0xda, 0xbc, 0x89, 0x33, 0xa7, 0xce, 0x9d, + 0x3c, 0x7b, 0xfa, 0xfc, 0x09, 0x34, 0xa8, 0xd0, 0xa1, 0x44, 0x8b, 0x1a, 0x6d, 0x07, 0x20, 0xa9, + 0xd2, 0xa5, 0x4c, 0x9b, 0x36, 0x3d, 0x2a, 0xca, 0xa9, 0xd4, 0xa9, 0x54, 0x93, 0x42, 0xd5, 0x54, + 0x35, 0xab, 0x56, 0xa5, 0x57, 0x2f, 0x6d, 0xfd, 0xaa, 0xb5, 0xab, 0x24, 0xb0, 0x64, 0xb3, 0x8a, + 0x85, 0x54, 0x36, 0xed, 0xd4, 0xb3, 0x8d, 0xd4, 0xba, 0x7d, 0xca, 0x56, 0xd1, 0xdb, 0xb9, 0x4b, + 0xe3, 0x26, 0xa2, 0x8b, 0xd7, 0x2e, 0x22, 0xbc, 0x79, 0xf5, 0x12, 0xe2, 0xdb, 0xd7, 0xaf, 0x20, + 0xc0, 0x74, 0x05, 0x0f, 0x22, 0x3c, 0xd7, 0xf0, 0x60, 0xc4, 0x6e, 0x15, 0x07, 0x62, 0xdc, 0xd8, + 0xf1, 0x1f, 0xc8, 0x6a, 0x25, 0x4f, 0xa6, 0x5c, 0xd6, 0xb2, 0x1f, 0xcc, 0x99, 0x35, 0xf3, 0xe1, + 0x4c, 0xd6, 0xf3, 0x67, 0xd0, 0x5f, 0x45, 0xef, 0x21, 0x5d, 0xda, 0x74, 0x1e, 0xd4, 0x5b, 0x55, + 0xaf, 0x66, 0x6d, 0xd6, 0xf5, 0x1d, 0xd8, 0xb1, 0x65, 0xd7, 0xa1, 0x5d, 0xd5, 0xb6, 0x1d, 0xdc, + 0x54, 0x75, 0xdf, 0xe6, 0x2d, 0xd5, 0x0a, 0x58, 0xdf, 0x12, 0x80, 0x07, 0x7f, 0x42, 0x98, 0xf8, + 0x02, 0xe3, 0x4e, 0x99, 0x80, 0x56, 0x7e, 0x80, 0x39, 0xdc, 0x23, 0xbc, 0x89, 0x4b, 0x67, 0x6a, + 0xe4, 0xba, 0xee, 0xeb, 0x75, 0x87, 0x70, 0xef, 0x6e, 0xfa, 0xbb, 0xd5, 0x20, 0xe2, 0xa7, 0x6b, + 0x2e, 0x0f, 0xa4, 0xfc, 0xda, 0xf3, 0xe2, 0x7d, 0xa8, 0xaf, 0xad, 0x18, 0xfd, 0x8e, 0xf7, 0xad, + 0x1d, 0xcb, 0xcf, 0x41, 0x7f, 0xb8, 0xe1, 0xfb, 0x36, 0xfe, 0xf2, 0x77, 0xf6, 0xcb, 0x1f, 0x0d, + 0xfe, 0x55, 0xa6, 0x57, 0x80, 0x32, 0x0c, 0x18, 0x59, 0x5c, 0x06, 0xbe, 0x80, 0x60, 0x62, 0x0a, + 0xb6, 0x37, 0x43, 0x83, 0x85, 0xb1, 0xb5, 0x20, 0x0b, 0x12, 0xf2, 0x75, 0x56, 0x85, 0x2a, 0x5c, + 0x08, 0x98, 0x58, 0x1a, 0xa2, 0xc0, 0x61, 0x72, 0x57, 0x7d, 0x68, 0x42, 0x88, 0x88, 0x8d, 0x08, + 0x61, 0x0b, 0x26, 0x32, 0x06, 0x15, 0x89, 0x23, 0xac, 0x08, 0xd9, 0x51, 0x2e, 0x86, 0x00, 0x63, + 0x8c, 0x46, 0xcd, 0xf8, 0x41, 0x8d, 0x94, 0xdd, 0x98, 0x62, 0x0a, 0x3a, 0xee, 0x48, 0x14, 0x8e, + 0x1d, 0xfc, 0x88, 0x59, 0x90, 0x3d, 0x96, 0x48, 0x64, 0x91, 0x31, 0x24, 0xc9, 0xe4, 0x7b, 0x51, + 0x08, 0xa9, 0x41, 0x93, 0x40, 0xba, 0x20, 0x65, 0x95, 0xf9, 0x2d, 0x01, 0x65, 0x06, 0x56, 0xb2, + 0x68, 0xe1, 0x96, 0x5e, 0xd2, 0x47, 0xdd, 0x91, 0x2f, 0x7e, 0x29, 0xa2, 0x8f, 0x64, 0x9e, 0xe9, + 0xa4, 0x10, 0x59, 0x5a, 0x80, 0x66, 0x87, 0x66, 0xb6, 0x09, 0xa7, 0x98, 0x3a, 0xac, 0x59, 0x41, + 0x9c, 0x81, 0x95, 0x60, 0x67, 0x9e, 0xdf, 0xb9, 0x27, 0x67, 0x8e, 0x7a, 0xbe, 0x05, 0xe2, 0x9f, + 0x82, 0x32, 0x37, 0x5f, 0x9f, 0x1e, 0x0c, 0x9a, 0xe0, 0x98, 0x88, 0x2e, 0x8a, 0x1b, 0x7e, 0x86, + 0x72, 0xc0, 0x28, 0x81, 0x8a, 0x46, 0x4a, 0x29, 0x69, 0x37, 0xd0, 0x59, 0x5c, 0xa5, 0xfa, 0x4d, + 0xaa, 0x69, 0xa7, 0x36, 0x46, 0xf8, 0x68, 0x94, 0x9e, 0xa6, 0x26, 0xc2, 0xa8, 0xa6, 0x7e, 0x0a, + 0x03, 0xa6, 0x10, 0x9c, 0x1a, 0x56, 0xa9, 0xac, 0xbe, 0xea, 0x26, 0x83, 0xa1, 0x62, 0x00, 0x6b, + 0x6e, 0xae, 0xd6, 0x8a, 0x2b, 0xa0, 0x54, 0xce, 0x7a, 0x41, 0xae, 0xeb, 0x81, 0xe0, 0x6b, 0xb0, + 0x69, 0xed, 0xba, 0x27, 0x8d, 0xc2, 0x9a, 0x77, 0xfe, 0xe8, 0xb1, 0xca, 0xd6, 0xb7, 0x21, 0xaf, + 0x75, 0x2e, 0x0b, 0x5e, 0xb2, 0xd0, 0x4e, 0x7b, 0xdc, 0x9b, 0xdc, 0xdd, 0x3a, 0xad, 0xb1, 0xd4, + 0x6e, 0x8b, 0x2c, 0x09, 0xaa, 0x32, 0xc0, 0x2d, 0x00, 0xda, 0x86, 0x4b, 0x6e, 0xa0, 0xc5, 0xfa, + 0xc9, 0x2d, 0xb0, 0xe4, 0xae, 0x2b, 0x2e, 0x92, 0xe7, 0x4a, 0xbb, 0xad, 0xba, 0xec, 0xae, 0x8b, + 0xa7, 0xb3, 0x99, 0x86, 0x2b, 0xef, 0xbc, 0xe5, 0x72, 0x2a, 0x5d, 0xbe, 0xe9, 0xc2, 0xab, 0x2f, + 0xbe, 0xd8, 0x6a, 0x87, 0xae, 0xc0, 0x43, 0x06, 0xcc, 0xee, 0xc0, 0xfd, 0x02, 0xfc, 0xef, 0xc1, + 0x08, 0xd3, 0xeb, 0xef, 0xc2, 0x0e, 0xef, 0x3b, 0xf1, 0xc3, 0x06, 0x57, 0x2c, 0x31, 0xa4, 0xf3, + 0x32, 0x6c, 0x71, 0xbc, 0x1c, 0x1b, 0x57, 0x30, 0xc5, 0x1b, 0x74, 0xbc, 0x31, 0xc6, 0x84, 0x7e, + 0x4c, 0x2d, 0xca, 0x24, 0x43, 0x6b, 0x32, 0xc8, 0x2a, 0xb3, 0xdc, 0xf2, 0xca, 0xd9, 0x8e, 0x6c, + 0xef, 0x03, 0x01, 0xbf, 0x2c, 0xb3, 0xb2, 0x34, 0xbf, 0x2b, 0x6a, 0xc9, 0x1a, 0xe7, 0x0c, 0x31, + 0xad, 0x35, 0x3b, 0x70, 0x73, 0xcc, 0x40, 0xc3, 0xdc, 0xeb, 0xd0, 0x0d, 0x20, 0x6c, 0xf4, 0xd1, + 0xcb, 0x0a, 0xcd, 0xb3, 0x96, 0x45, 0xef, 0xec, 0xb4, 0xc8, 0x13, 0x7c, 0x8b, 0x00, 0xd3, 0x3f, + 0x57, 0x7d, 0xf1, 0xd5, 0x4a, 0x83, 0x3b, 0x75, 0xcf, 0x5c, 0x77, 0x1d, 0x01, 0xd6, 0xd1, 0x85, + 0x2d, 0xf5, 0xd8, 0x56, 0xaf, 0xfa, 0xf5, 0x72, 0x68, 0x43, 0xad, 0x36, 0xd9, 0x44, 0xb7, 0xad, + 0x80, 0xd6, 0x54, 0xc7, 0xed, 0xf1, 0xbd, 0xd7, 0x36, 0x3d, 0xf3, 0xdd, 0x78, 0xa7, 0xac, 0x37, + 0xc1, 0x5b, 0x27, 0x3c, 0xf8, 0xdf, 0x80, 0xb3, 0x1d, 0x35, 0xdc, 0x84, 0xfb, 0x6d, 0x38, 0xd2, + 0x36, 0xd3, 0x9d, 0x80, 0xdd, 0x62, 0x37, 0xfe, 0x7e, 0xf8, 0xdc, 0x89, 0x27, 0xad, 0x2f, 0xdf, + 0x94, 0xe7, 0x5a, 0x36, 0xe4, 0x59, 0x67, 0xae, 0xf9, 0xe6, 0xb8, 0x22, 0xbe, 0x77, 0xe1, 0x72, + 0x63, 0x2e, 0x7a, 0xe5, 0x6e, 0x5f, 0xce, 0x26, 0xe8, 0xa6, 0xa7, 0x7e, 0xec, 0xe3, 0xac, 0xb7, + 0xbe, 0x38, 0xe3, 0xb0, 0xc7, 0xbe, 0xb4, 0xe7, 0x9f, 0xd7, 0x3e, 0xf9, 0xed, 0x3a, 0xe7, 0x3e, + 0xfb, 0xb3, 0xbc, 0xa7, 0xed, 0xbb, 0xe3, 0x91, 0xeb, 0x7e, 0xf6, 0xf0, 0x8a, 0x17, 0x8f, 0xfb, + 0xea, 0xa5, 0xbf, 0xde, 0x37, 0xf4, 0xcc, 0x73, 0xee, 0xbc, 0xe0, 0xd2, 0x3f, 0x8d, 0xf3, 0xf4, + 0xaf, 0x82, 0x1d, 0xbc, 0xf0, 0xa7, 0xa3, 0xae, 0x7d, 0xf3, 0xbb, 0x3f, 0x7f, 0xbd, 0xf8, 0xb6, + 0x87, 0x3f, 0x7a, 0xdd, 0xc8, 0x27, 0xdf, 0x70, 0xe8, 0xe8, 0x8f, 0x5a, 0x7d, 0xc6, 0xee, 0xd7, + 0x1a, 0xf1, 0xfb, 0xd4, 0x8f, 0x6f, 0xfd, 0xfc, 0xb0, 0xd6, 0x6f, 0x3f, 0xfd, 0xc7, 0x77, 0xef, + 0xbd, 0xe8, 0xe9, 0xaf, 0x7f, 0x95, 0xfa, 0x1f, 0xf9, 0x06, 0x68, 0xaa, 0x71, 0x11, 0xf0, 0x7e, + 0x06, 0x30, 0x9b, 0xfa, 0x54, 0x57, 0xbe, 0x05, 0x7a, 0xca, 0x80, 0xf9, 0x43, 0xe0, 0x04, 0x15, + 0x28, 0x41, 0xff, 0x35, 0x70, 0x7d, 0x14, 0x34, 0x9f, 0x05, 0x33, 0x38, 0x28, 0xfc, 0xc9, 0x2f, + 0x7b, 0xac, 0xe2, 0x17, 0x08, 0x4b, 0xc8, 0xbe, 0x0a, 0x92, 0x30, 0x81, 0x0a, 0x3b, 0x21, 0x0a, + 0x03, 0xe0, 0xc0, 0xf8, 0xf9, 0xca, 0x84, 0x2e, 0x64, 0x21, 0x0c, 0x39, 0xf8, 0xc0, 0x60, 0x79, + 0xab, 0x86, 0x1a, 0x8c, 0xa1, 0x0c, 0x35, 0x88, 0x41, 0x1e, 0xc2, 0x6f, 0x83, 0x00, 0x24, 0x5e, + 0xfa, 0x68, 0x28, 0xc4, 0x4e, 0x11, 0xf1, 0x80, 0xfc, 0x3b, 0x95, 0xbb, 0x92, 0xe8, 0xc4, 0x1b, + 0x16, 0xd1, 0x88, 0xdb, 0xab, 0x17, 0xfe, 0x14, 0xa3, 0xe8, 0x43, 0xee, 0xed, 0xef, 0x89, 0x57, + 0xbc, 0x60, 0x16, 0xb5, 0xf8, 0xc2, 0x1d, 0x76, 0x71, 0x88, 0x5f, 0x04, 0xe3, 0x10, 0xb9, 0x38, + 0x46, 0x4d, 0x49, 0x91, 0x89, 0x2d, 0x54, 0xa3, 0xb9, 0xd2, 0xa8, 0xc4, 0x32, 0x9a, 0xd1, 0x8d, + 0x27, 0x80, 0x23, 0xfc, 0xe4, 0x38, 0xc7, 0x48, 0x35, 0xcb, 0x8e, 0x6a, 0xc4, 0x63, 0x1e, 0x11, + 0xb5, 0x02, 0x3e, 0xc6, 0x11, 0x87, 0xa4, 0xd3, 0x63, 0x20, 0x05, 0x59, 0x40, 0x3f, 0xfe, 0x51, + 0x4f, 0x2a, 0x42, 0x24, 0xa5, 0xd6, 0xa8, 0xc2, 0x3a, 0x1a, 0xf2, 0x90, 0x8e, 0x34, 0x9c, 0xac, + 0x00, 0xd9, 0xc8, 0x4a, 0xfe, 0x2d, 0x55, 0x21, 0x24, 0x96, 0x26, 0xe3, 0xb6, 0xa4, 0x3f, 0x71, + 0xf2, 0x93, 0xa0, 0x0c, 0xa5, 0x9d, 0x4c, 0x49, 0xca, 0xb1, 0x81, 0x0a, 0x4e, 0x07, 0x4a, 0xa5, + 0xda, 0x04, 0x84, 0x26, 0x58, 0xba, 0x92, 0x6b, 0x35, 0x38, 0x53, 0x2d, 0x67, 0x49, 0xcb, 0xfe, + 0x6c, 0x49, 0x97, 0xb8, 0x74, 0x1a, 0x0e, 0xac, 0x74, 0xa9, 0x5e, 0xfa, 0xf2, 0x97, 0x4c, 0x72, + 0x94, 0x30, 0x81, 0x56, 0x28, 0x1d, 0xcd, 0xe9, 0x98, 0xc8, 0x4c, 0xa6, 0x89, 0x78, 0xc0, 0xcc, + 0x66, 0x42, 0x33, 0x44, 0x3d, 0x88, 0x66, 0xce, 0xd2, 0xd3, 0xa0, 0x1f, 0x58, 0x53, 0x66, 0x6a, + 0xba, 0x12, 0x36, 0xb7, 0xd9, 0x31, 0x22, 0xa8, 0xc7, 0x3b, 0xe0, 0x0c, 0x67, 0x11, 0x22, 0xc9, + 0xa7, 0x72, 0x3e, 0x2c, 0x09, 0xd5, 0x09, 0x93, 0x3a, 0x25, 0x87, 0x84, 0xe7, 0x60, 0xe9, 0x9d, + 0xf0, 0x9c, 0x27, 0x86, 0x9c, 0x40, 0xcf, 0x7a, 0x42, 0x61, 0x53, 0x52, 0xc8, 0xe7, 0xdb, 0x62, + 0xe1, 0x4f, 0xd7, 0x41, 0xc7, 0x0d, 0x8a, 0x1c, 0x28, 0x3e, 0x09, 0x69, 0xd0, 0x7e, 0x22, 0x34, + 0xa1, 0xfb, 0x5c, 0x28, 0x43, 0xfe, 0x0f, 0x3a, 0xc5, 0x87, 0x76, 0xa1, 0xa0, 0x12, 0x8d, 0xa7, + 0x43, 0x2b, 0xaa, 0x04, 0x8a, 0x62, 0xf4, 0x9c, 0x17, 0xdd, 0xa8, 0x3b, 0xd9, 0xe8, 0xd1, 0x2f, + 0x68, 0x34, 0xa4, 0xe4, 0xe9, 0x28, 0x49, 0xc9, 0x19, 0xd1, 0x93, 0x52, 0x61, 0xa4, 0x2a, 0xad, + 0xa6, 0x49, 0x5b, 0xaa, 0xcd, 0x97, 0xc2, 0xd4, 0xa5, 0x29, 0x9d, 0x29, 0x72, 0x64, 0x6a, 0xd3, + 0x65, 0xd6, 0x34, 0xa7, 0xce, 0xc1, 0x29, 0x4f, 0x83, 0xb9, 0xd3, 0x9f, 0xb2, 0xd3, 0xa7, 0x42, + 0x95, 0x25, 0x48, 0x8b, 0xfa, 0x24, 0x96, 0x22, 0x15, 0x95, 0x01, 0x6d, 0xaa, 0x53, 0x9f, 0x0a, + 0xd5, 0xa8, 0x4a, 0x75, 0xaa, 0x54, 0xad, 0xaa, 0x55, 0xaf, 0x8a, 0xd5, 0xac, 0x6a, 0x75, 0xab, + 0x5c, 0xed, 0xaa, 0x57, 0xbf, 0x0a, 0xd6, 0xb0, 0x8a, 0x75, 0xac, 0x64, 0x2d, 0xab, 0x59, 0xcf, + 0x8a, 0xd6, 0xb4, 0xaa, 0x75, 0xad, 0x6c, 0x6d, 0xab, 0x5b, 0xdf, 0x0a, 0xd7, 0xb8, 0xca, 0x75, + 0xae, 0x74, 0xad, 0xab, 0x5d, 0xef, 0x8a, 0xd7, 0xbc, 0xea, 0x75, 0xaf, 0x7c, 0xed, 0xab, 0x5f, + 0xff, 0x0a, 0xd8, 0xc0, 0x0a, 0x76, 0xb0, 0x84, 0x2d, 0xac, 0x61, 0x0f, 0x8b, 0xd8, 0xc4, 0x2a, + 0x76, 0xb1, 0x8c, 0x6d, 0xac, 0x63, 0x1f, 0x0b, 0xd9, 0xc8, 0x4a, 0x76, 0xb2, 0x94, 0xad, 0xac, + 0x65, 0x2f, 0x8b, 0xd9, 0xcc, 0x6a, 0x76, 0xb3, 0x9c, 0xed, 0xac, 0x67, 0x3f, 0x0b, 0xda, 0xd0, + 0x8a, 0x76, 0xb4, 0xa4, 0x2d, 0xad, 0x69, 0x4f, 0x8b, 0xda, 0xd4, 0xaa, 0x76, 0xb5, 0xac, 0x6d, + 0xad, 0x6b, 0x5f, 0x0b, 0xdb, 0xd8, 0xca, 0x76, 0xb6, 0xb4, 0xad, 0xad, 0x6d, 0x6f, 0x8b, 0xdb, + 0xdc, 0xea, 0x76, 0xb7, 0xbc, 0xed, 0xad, 0x6f, 0x7f, 0x0b, 0xdc, 0xe0, 0x0a, 0x77, 0xb8, 0xc4, + 0x2d, 0xae, 0x71, 0x8f, 0xfe, 0x8b, 0xdc, 0xe4, 0x2a, 0x77, 0xb9, 0xcc, 0x6d, 0xae, 0x73, 0x9f, + 0x0b, 0xdd, 0xe8, 0x4a, 0x77, 0xba, 0xd4, 0xad, 0xae, 0x75, 0xaf, 0x3b, 0xc3, 0xa5, 0xb6, 0x71, + 0x92, 0xda, 0x0d, 0x22, 0x77, 0xbb, 0x1b, 0xb2, 0x02, 0x82, 0xd7, 0xbb, 0x8c, 0x1a, 0x2f, 0x79, + 0x17, 0x65, 0xde, 0x26, 0xa2, 0x37, 0xbd, 0x2b, 0xcc, 0x13, 0x7b, 0xdb, 0x7b, 0xca, 0xf7, 0x46, + 0x50, 0x94, 0xf2, 0x3d, 0xdf, 0x7a, 0xeb, 0x4b, 0xc5, 0x47, 0xe2, 0x37, 0xbf, 0xdf, 0xdd, 0x2f, + 0x05, 0x6c, 0xe8, 0xdf, 0x00, 0x8a, 0x37, 0xc0, 0x02, 0xd6, 0x2f, 0x81, 0xff, 0x7b, 0xc6, 0x03, + 0x07, 0x6e, 0xc0, 0x0a, 0xee, 0xdc, 0x05, 0x1b, 0xec, 0x60, 0x25, 0x42, 0x38, 0xc2, 0x74, 0x9c, + 0xb0, 0xe5, 0x24, 0x6c, 0xe1, 0x0b, 0x57, 0x38, 0xc3, 0x3f, 0x2c, 0x2f, 0x87, 0x81, 0x87, 0xe1, + 0x0f, 0xe7, 0x70, 0xc3, 0x22, 0x4e, 0x21, 0x83, 0x4b, 0x6c, 0x62, 0x03, 0xa3, 0x38, 0xc5, 0xfd, + 0x45, 0x31, 0x80, 0x57, 0x0c, 0xc9, 0x13, 0xaf, 0xf8, 0xc5, 0x33, 0x4e, 0x30, 0x8c, 0x69, 0xec, + 0x62, 0x1b, 0xd7, 0xf8, 0xc1, 0x30, 0x8e, 0xb1, 0x8a, 0x6f, 0xac, 0xe3, 0x1c, 0xf3, 0x18, 0xc8, + 0x43, 0xde, 0x71, 0x88, 0x89, 0x7c, 0x64, 0x23, 0x6b, 0x87, 0xa8, 0x36, 0x85, 0x50, 0x50, 0x09, + 0x5c, 0xac, 0x27, 0x07, 0xf8, 0x5c, 0xe8, 0x54, 0x72, 0x3b, 0x59, 0xcc, 0x9a, 0x1e, 0x77, 0x18, + 0x35, 0x23, 0xa6, 0x8d, 0x96, 0x17, 0x29, 0xcf, 0x2e, 0x5b, 0xea, 0xcb, 0x60, 0x9e, 0xd2, 0x96, + 0x4f, 0x44, 0x66, 0xd9, 0x8d, 0xb9, 0x90, 0xa8, 0x4a, 0x33, 0x88, 0xcd, 0x8c, 0xe0, 0x3b, 0xb9, + 0x99, 0x76, 0x13, 0x9a, 0xb3, 0x9d, 0xef, 0x8c, 0xe7, 0x3c, 0xeb, 0x79, 0xcf, 0x7c, 0xee, 0xb3, + 0x9f, 0xff, 0x0c, 0x8c, 0xe8, 0x40, 0x0b, 0x7a, 0xd0, 0x84, 0x2e, 0xb4, 0xa1, 0x0f, 0x8d, 0xe8, + 0x44, 0x2b, 0x7a, 0xd1, 0x8c, 0x6e, 0xb4, 0xa3, 0x1f, 0x0d, 0xe9, 0x48, 0x4b, 0x7a, 0xd2, 0x94, + 0xae, 0xb4, 0xa5, 0x2f, 0x8d, 0xe9, 0x4c, 0x6b, 0x7a, 0xd3, 0x9c, 0xee, 0xb4, 0xa7, 0x3f, 0x0d, + 0xea, 0x50, 0x8b, 0x7a, 0xd4, 0xa4, 0x2e, 0xb5, 0xa9, 0x4f, 0x8d, 0xea, 0x54, 0xab, 0x7a, 0xd5, + 0xac, 0x6e, 0xb5, 0xab, 0x5f, 0x0d, 0xeb, 0x58, 0xcb, 0x7a, 0xd6, 0xb4, 0xae, 0xb5, 0xad, 0x6f, + 0x8d, 0xeb, 0x5c, 0xeb, 0x7a, 0xd7, 0xbc, 0xee, 0xb5, 0xaf, 0x7f, 0x0d, 0xec, 0x60, 0x0b, 0x7b, + 0xd8, 0xc4, 0x2e, 0xb6, 0xb1, 0x8f, 0x8d, 0xec, 0x64, 0x2b, 0x7b, 0xd9, 0xcc, 0x6e, 0xb6, 0xb3, + 0x9f, 0x0d, 0xed, 0x68, 0x4b, 0x7b, 0xda, 0xd4, 0xae, 0xb6, 0xb5, 0xaf, 0x8d, 0xed, 0x6c, 0x6b, + 0x7b, 0xdb, 0xdc, 0xee, 0xb6, 0xb7, 0xbf, 0x0d, 0xee, 0x70, 0x8b, 0x7b, 0xdc, 0x22, 0x29, 0x00, + 0x00, 0x3b }; diff --git a/src/utils/gui/images/textures/POITextures/Nature.cpp b/src/utils/gui/images/textures/POITextures/Nature.cpp index 7d21871da957..ade07af8b461 100644 --- a/src/utils/gui/images/textures/POITextures/Nature.cpp +++ b/src/utils/gui/images/textures/POITextures/Nature.cpp @@ -21,149 +21,149 @@ const unsigned char POITexture_Nature[] = { - 0x47,0x49,0x46,0x38,0x39,0x61,0x00,0x02,0x00,0x02,0x80,0x01,0x00,0x00,0x00,0x00, - 0xff,0xff,0xff,0x21,0xfe,0x11,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69, - 0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x00,0x21,0xf9,0x04,0x01,0x0a,0x00,0x01,0x00, - 0x2c,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x02,0x00,0x02,0xfe,0x8c,0x8f,0xa9,0xcb, - 0xed,0x0f,0xa3,0x9c,0xb4,0xda,0x8b,0x73,0x06,0xbc,0x73,0x0d,0x86,0xe2,0x48,0x96, - 0xe6,0x89,0xa6,0xea,0xca,0xb6,0xae,0xe9,0xc5,0xf1,0x4b,0xd7,0xf6,0x8d,0xe7,0xfa, - 0xce,0xf7,0xa0,0x0c,0x9c,0xf9,0x86,0xc4,0xa2,0xf1,0x88,0x4c,0x2a,0x27,0xc1,0x66, - 0x67,0x09,0x8d,0x4a,0xa7,0xd4,0x6a,0xd5,0x89,0x05,0x58,0xb7,0xdc,0xae,0xf7,0x0b, - 0x8e,0x64,0xb3,0xe1,0xb2,0xf9,0x8c,0x4e,0xd7,0xc6,0x63,0xb5,0xfb,0x0d,0x8f,0xcb, - 0x0d,0x6c,0xf6,0xfc,0x8e,0xcf,0xeb,0x8d,0xf5,0xfa,0xfe,0x0f,0x18,0x28,0x38,0xd2, - 0xd7,0x37,0x78,0x88,0x98,0x98,0x58,0x58,0xa8,0xe8,0xf8,0x08,0xe9,0xc6,0xc8,0x18, - 0x59,0x69,0x79,0x29,0x35,0x39,0x89,0xc9,0xd9,0xe9,0x89,0xa3,0xa9,0xf9,0x39,0x4a, - 0x5a,0x2a,0x12,0x1a,0x6a,0xaa,0xba,0xca,0xba,0x80,0x8a,0xda,0x1a,0x2b,0xfb,0xf9, - 0xfa,0x3a,0x7b,0x8b,0xeb,0x58,0x5b,0x9b,0xdb,0xeb,0xbb,0xb7,0x6b,0xfb,0x3b,0x4c, - 0xac,0x16,0xcc,0x5b,0x9c,0xac,0xcc,0x75,0xbc,0xbb,0xfc,0x0c,0xad,0xd4,0x1c,0x1c, - 0x5d,0x6d,0xbd,0x33,0x7d,0x7c,0xbd,0xcd,0xcd,0x92,0xdd,0xdc,0x1d,0x2e,0x1e,0xf2, - 0x3d,0x3d,0x7e,0x8e,0x2e,0x56,0x6e,0x9e,0xde,0xee,0x1e,0xb0,0xfe,0xfd,0x3e,0x2f, - 0x1e,0x5f,0x4e,0x8f,0x6f,0x6d,0xbf,0x9e,0xdf,0xaf,0xbc,0x1f,0xcf,0x9f,0x40,0x5f, - 0x00,0xed,0x0d,0x3c,0x28,0xab,0xe0,0x3e,0x84,0x0c,0x4d,0x29,0x04,0xd8,0x30,0x62, - 0xa7,0x87,0x05,0x25,0x5a,0x8c,0x44,0x51,0xe1,0xc5,0xfe,0x8d,0x8b,0x32,0x42,0xe4, - 0x08,0x12,0x90,0x47,0x8d,0x21,0x4b,0xde,0x19,0xf9,0xd0,0xa4,0xca,0x37,0x28,0x29, - 0xae,0x7c,0x69,0xa6,0x65,0x46,0x98,0x34,0xbb,0xc8,0xf4,0x58,0x33,0xe7,0x94,0x9b, - 0x23,0x75,0xfa,0x4c,0xc2,0x13,0xe5,0xcf,0xa1,0x43,0x82,0xb6,0x24,0x8a,0x34,0x87, - 0x51,0x99,0x49,0x9b,0xbe,0x58,0x7a,0xd3,0xa9,0xd4,0x14,0x50,0x79,0x4e,0xbd,0x4a, - 0xa8,0xaa,0x55,0xac,0x5c,0x2f,0x68,0x35,0xda,0x35,0xac,0x84,0xaf,0x4b,0xc5,0x9a, - 0x65,0x40,0x16,0xea,0xd9,0xb5,0x07,0xd2,0x96,0x65,0x7b,0xd6,0xad,0x5a,0xb8,0x61, - 0xe5,0x56,0xa5,0xcb,0xd5,0xae,0x56,0xbc,0x53,0xf5,0x7e,0xe5,0xdb,0xd4,0x2f,0x59, - 0xc0,0x44,0x05,0xa7,0x25,0xec,0xd3,0xb0,0x5b,0xc4,0x35,0x15,0xcb,0x65,0xfc,0xd2, - 0xb1,0x5d,0xc8,0x26,0x25,0xeb,0xa5,0x0c,0xd2,0xb2,0x5f,0xcc,0x17,0x35,0x0b,0xe6, - 0x1c,0xd1,0xb3,0x61,0xd0,0x08,0x45,0x2b,0x26,0x2d,0xd0,0xb4,0x63,0xd4,0xfd,0x54, - 0x9f,0x66,0x4d,0xcf,0xf5,0x6a,0xd8,0xee,0x64,0x4b,0xa6,0x9d,0xce,0xb6,0x65,0xdc, - 0xe3,0x74,0x6b,0xe6,0xdd,0xcd,0xb7,0x67,0xe0,0xd7,0x84,0x8b,0x26,0x1e,0xcd,0xb8, - 0x69,0xe4,0xcb,0x94,0xab,0x66,0x5e,0xcc,0xb9,0x6b,0xe8,0xbf,0xa4,0xcb,0xa6,0x9e, - 0xcb,0xba,0x6d,0xec,0xb3,0xb4,0xeb,0xe6,0xde,0xca,0xbb,0x6f,0xf0,0xaa,0xc4,0x0b, - 0x27,0x4f,0xca,0xbc,0x71,0xf4,0x9e,0xd4,0xaf,0x67,0xcf,0xc9,0xfd,0x7b,0xf8,0x95, - 0xe4,0x2b,0xa7,0x8f,0xd1,0xfe,0x7d,0xfc,0x8a,0xfe,0xf4,0x4b,0xe7,0x8f,0x88,0x7f, - 0xd6,0x01,0x28,0x88,0x80,0xda,0x11,0xf8,0x87,0x81,0xde,0x21,0x98,0x87,0x82,0xe2, - 0x31,0x38,0x87,0x83,0xe6,0x41,0x08,0x87,0x84,0xea,0x51,0x68,0x8c,0x85,0x17,0x62, - 0x18,0x93,0x86,0xee,0x71,0x18,0x86,0x87,0xf6,0x81,0xe8,0x85,0x88,0xfa,0x91,0xb8, - 0x85,0x89,0xfe,0xa1,0x48,0x85,0x8a,0x02,0xb2,0x98,0x89,0x8b,0x27,0xc2,0xb8,0x84, - 0x8c,0x2f,0xd2,0x88,0x84,0x8d,0x06,0xe2,0xc8,0x87,0x8e,0x3b,0xf2,0xe8,0x83,0x8f, - 0x0e,0x02,0xc9,0x83,0x90,0x12,0x12,0xa9,0x94,0x91,0x47,0x22,0xb9,0x86,0x92,0x16, - 0x32,0xf9,0x94,0x93,0x1a,0x42,0xe9,0x8d,0x94,0x1e,0x52,0x49,0x95,0x95,0x22,0x62, - 0x09,0x83,0x96,0x26,0x72,0x99,0x95,0x97,0x5f,0x82,0xa9,0x81,0x98,0x32,0x92,0x89, - 0x81,0x99,0x36,0xa2,0x59,0x81,0x9a,0x3a,0xb2,0xc9,0x84,0x9b,0x67,0xc2,0x09,0x81, - 0x9c,0x6f,0xd2,0xd9,0x80,0x9d,0x3e,0xe2,0xe9,0x8a,0x9e,0x7b,0xf2,0xd9,0x96,0x9f, - 0x42,0x02,0x0a,0x8f,0xa0,0x46,0xf2,0x69,0xa8,0x93,0x74,0x26,0x2a,0x25,0x9b,0x8c, - 0x5a,0x89,0xe6,0xa3,0x8d,0x82,0x29,0x29,0xa4,0x58,0x56,0xaa,0xe5,0xa5,0x98,0x4e, - 0x0a,0xe5,0xa6,0x9c,0x22,0xe9,0xa9,0xa5,0xa0,0x86,0xaa,0x28,0x93,0xa4,0x96,0x4a, - 0xe4,0xa9,0x9f,0xe2,0xa8,0x2a,0xaa,0x3c,0xb6,0xaa,0xe4,0xa8,0xb0,0xfe,0x09,0xe4, - 0xac,0x83,0xa6,0x6a,0xeb,0x9d,0xb5,0xe6,0xba,0x26,0xae,0xbc,0xba,0x28,0xeb,0xaf, - 0x63,0xfa,0x2a,0xec,0x94,0xa6,0x16,0x7b,0xfe,0xe5,0xb1,0xc8,0x3e,0xd9,0xe9,0xb2, - 0x43,0x52,0xe9,0xec,0xb3,0xcd,0x46,0x7b,0x23,0xb4,0xd4,0xce,0xa8,0xe9,0xb5,0x1f, - 0x92,0xa9,0xed,0xb6,0xdc,0x76,0xbb,0x20,0x9c,0xe0,0x0e,0x88,0xe7,0xb8,0xfb,0x21, - 0x6a,0xee,0x77,0x84,0x16,0x9a,0xee,0x73,0xeb,0x06,0xda,0xee,0x6e,0xef,0x26,0x10, - 0xef,0x6d,0xf3,0xa2,0x55,0xef,0x63,0xf7,0xaa,0x93,0xef,0x5b,0xfb,0x16,0xe9,0xec, - 0xbf,0x2c,0x51,0x2b,0x70,0x1a,0xdd,0x16,0x7c,0xc6,0xc1,0x08,0x87,0x08,0xee,0xc2, - 0x5f,0xa4,0xeb,0x30,0x33,0xed,0x46,0x7c,0x45,0xbd,0x14,0xc7,0x98,0xef,0xc5,0x35, - 0xf6,0xfb,0x81,0xc6,0x39,0x72,0xac,0x85,0xc7,0x3d,0x82,0x1c,0xb2,0xc8,0x41,0x92, - 0xfc,0x84,0xc9,0x00,0xa3,0x9c,0xb2,0xca,0xa0,0xb0,0x2c,0x84,0xcb,0x4d,0xc2,0x1c, - 0xb3,0xcc,0x2d,0xd0,0x1c,0x84,0xcd,0x2e,0xe0,0x0c,0x84,0xce,0x55,0xf2,0x2c,0x83, - 0xcf,0x59,0x02,0xdd,0xb3,0xd0,0x25,0x10,0xed,0x84,0xd1,0x61,0x22,0x9d,0xb3,0xd2, - 0x65,0x32,0x8d,0x85,0xd3,0x69,0x42,0x4d,0x86,0xd4,0x6d,0x52,0x1d,0xb5,0xd5,0x71, - 0x62,0x9d,0xb5,0xd6,0x0f,0x70,0x6d,0x87,0xd7,0x79,0x82,0x1d,0xb6,0xd8,0xf4,0x92, - 0xed,0x87,0xd9,0xf0,0xa2,0x5d,0xb6,0xd8,0x6c,0x53,0x62,0xf6,0xdb,0x8d,0xb8,0x2d, - 0xf7,0xdc,0x56,0xd7,0xbd,0x89,0xd4,0x78,0x8b,0xa2,0xf4,0xde,0xa9,0x08,0xed,0x37, - 0x2c,0x3a,0x07,0x2e,0x8c,0xcb,0x84,0x23,0xa3,0xf2,0xe1,0x85,0x8b,0xac,0x38,0xe2, - 0x1a,0x37,0xee,0xcc,0xe3,0x90,0x47,0xfe,0x1e,0xf1,0xe4,0xda,0x38,0x6c,0x39,0x38, - 0x08,0x67,0xce,0x8e,0xc0,0x9c,0x6b,0xfe,0xef,0xe7,0x9d,0xcf,0x2b,0x7a,0x36,0xf7, - 0x96,0x2e,0xcf,0xba,0xa8,0xdf,0x03,0xe8,0xea,0xfc,0x94,0xeb,0xfa,0xeb,0xe2,0xc6, - 0xce,0xba,0xa3,0xb4,0xcb,0x4e,0xe9,0xed,0x01,0xe5,0xae,0xfb,0xee,0xd6,0xf6,0x6e, - 0xd0,0xb4,0xc0,0x07,0x4f,0xec,0xf0,0xc4,0xbf,0x6a,0xfc,0x47,0xc8,0x27,0xaf,0x3c, - 0x8c,0xcc,0xa7,0xe4,0xfc,0xf3,0xd0,0x93,0x28,0xfd,0x4c,0x20,0x56,0x8f,0x13,0x86, - 0xd8,0xf7,0x44,0xe1,0xf6,0xd9,0x33,0xe8,0x3d,0xf7,0x04,0x86,0x2f,0x14,0x80,0xe4, - 0x1f,0x85,0xdf,0xf9,0x4c,0xc1,0xa7,0x7e,0x54,0xe8,0xb5,0xbf,0x15,0x78,0xf0,0xbb, - 0xcf,0xdd,0xfc,0xf1,0x43,0x67,0x7f,0x50,0xd4,0xe5,0x0f,0x16,0x72,0xfc,0xfb,0x8b, - 0x9b,0xff,0xcd,0x85,0x36,0x02,0xbc,0x0b,0x01,0x0b,0x08,0x40,0xd2,0x20,0xd0,0x80, - 0x0a,0x5c,0x20,0x03,0x31,0xe3,0xc0,0xbf,0x40,0x30,0x82,0x12,0x64,0x0c,0x05,0x0f, - 0x83,0x98,0x0b,0x2e,0x86,0x30,0x1a,0xc4,0x20,0x5f,0x3a,0xb8,0x41,0xba,0x80,0x50, - 0x5f,0x6c,0x19,0xe1,0x64,0xd6,0x62,0xc2,0xcb,0xc4,0x25,0x85,0x24,0xac,0x0b,0x0b, - 0x4f,0xd8,0x95,0x17,0x6e,0x26,0x86,0x32,0x84,0x21,0x56,0x6a,0x68,0xc3,0xbe,0xe0, - 0x30,0x87,0x4e,0xd9,0x21,0x0f,0x03,0xe3,0xc3,0x10,0x4a,0x25,0x88,0x3f,0x2c,0x0c, - 0x11,0x85,0x08,0xc4,0x23,0x0e,0x46,0x87,0x4a,0xac,0x60,0x0f,0x9b,0xe8,0xc4,0x24, - 0x42,0x71,0x80,0x4f,0x9c,0x22,0xfe,0x15,0xa5,0x68,0x45,0xfd,0x31,0x31,0x8b,0x5a, - 0xdc,0x22,0x17,0xd1,0x77,0x95,0x2f,0xde,0x6f,0x88,0x62,0x5c,0xdf,0x0d,0xcb,0x28, - 0xbe,0x33,0xa2,0xd1,0x7a,0x79,0x59,0x23,0x1b,0xdb,0xe8,0xc6,0x8a,0x98,0x25,0x8e, - 0xcd,0x73,0x21,0x1d,0x7d,0x37,0xc7,0x3b,0xd6,0x0e,0x85,0x7a,0x1c,0x5d,0x09,0xfb, - 0x48,0x0d,0xc0,0x00,0xd2,0x71,0x1f,0x1c,0x24,0xdf,0x20,0x63,0x48,0x43,0x34,0x30, - 0x91,0x49,0x83,0x0d,0x23,0x83,0xe6,0xbf,0x44,0x7e,0x8b,0x76,0x46,0x03,0x9e,0xcf, - 0x8c,0x67,0x33,0xe6,0xc9,0x4c,0x93,0x89,0x7b,0x9e,0xc9,0xb0,0xe7,0x31,0xef,0x5d, - 0x8c,0x7c,0x95,0x3b,0xdf,0xc2,0xe0,0x57,0x30,0xfb,0x79,0x6e,0x7e,0xa1,0xcb,0xdf, - 0xe9,0xfe,0xf7,0x2e,0x04,0x12,0xca,0x81,0xe8,0xa2,0xe5,0xec,0x28,0x68,0x3b,0x0d, - 0x4e,0xb2,0x83,0xbc,0xe3,0x65,0xb6,0x46,0xf8,0xbb,0x14,0x2a,0xeb,0x85,0xc5,0x23, - 0x26,0xab,0x82,0x48,0x23,0x25,0xb2,0x08,0x8a,0x28,0x62,0xe6,0xf5,0xa6,0xc8,0x21, - 0x2e,0x76,0xef,0x8b,0xe0,0x2b,0xe3,0xf8,0xd6,0xc8,0x1f,0x3a,0xd2,0x47,0x8f,0xec, - 0x01,0xe4,0xfb,0xfa,0x48,0x1e,0x43,0xd6,0x4f,0x92,0xf8,0x7b,0x24,0x73,0x1e,0xd9, - 0xb2,0x00,0xa2,0x33,0x9d,0xac,0x59,0x67,0xcd,0x16,0xe9,0x4e,0x76,0x72,0x26,0x9e, - 0xef,0x9c,0x20,0x3d,0x3d,0x00,0xcf,0x7b,0xca,0x93,0x83,0xfa,0x2c,0x9a,0x05,0xfb, - 0xd9,0x34,0x7e,0x02,0x34,0xa0,0x78,0x19,0x68,0xd7,0xe0,0x62,0xd0,0xaa,0xfd,0x31, - 0xa1,0x07,0xcd,0x23,0x43,0xfe,0x1b,0xb9,0xc2,0x87,0x36,0x14,0x8e,0x12,0x9d,0xa8, - 0x17,0x2b,0x0a,0xd1,0x30,0x62,0x34,0x6d,0x17,0xdd,0xa8,0x45,0x87,0xe2,0x51,0xb8, - 0x25,0x25,0xa4,0x79,0x43,0x0a,0x49,0x45,0x0a,0xd2,0x93,0xa2,0x54,0x27,0x2a,0x3d, - 0x64,0x4e,0x5a,0xfa,0xb7,0xc6,0xc0,0x34,0xa6,0x91,0x99,0xa9,0xe0,0x56,0x62,0x53, - 0x42,0x66,0x26,0xa7,0x3a,0xed,0x0c,0x4f,0x29,0xc7,0x91,0x9f,0x02,0xd5,0xa7,0x42, - 0xed,0x29,0x43,0x8a,0x7a,0x39,0x89,0x20,0x15,0x74,0x47,0x5d,0x2a,0x53,0x07,0xe2, - 0x54,0xd3,0x1d,0x24,0xaa,0xa9,0xf3,0x07,0x55,0xf7,0x88,0x8f,0xab,0x56,0x35,0xab, - 0x5a,0xdd,0xea,0x3b,0xba,0x8a,0xbb,0x76,0x80,0x15,0x8f,0xe8,0x18,0xeb,0xf1,0x7a, - 0x63,0xd6,0xb3,0x06,0x27,0xad,0x0b,0xa9,0x07,0x5b,0xeb,0xa8,0x8f,0xb7,0xca,0x71, - 0x1b,0x72,0x9d,0x6b,0x5c,0xeb,0x0a,0xd7,0xe6,0xe0,0x95,0x24,0xd0,0xd8,0xab,0x4b, - 0x9e,0xe1,0xd7,0x37,0x46,0x27,0xb0,0xd3,0x1b,0x2c,0x61,0x0b,0x3b,0x8c,0xc3,0xfe, - 0x95,0x18,0x8a,0x5d,0x6c,0x62,0x1b,0x8b,0xd8,0x5e,0x40,0x36,0xb2,0xd9,0x99,0xac, - 0x5d,0x25,0x6b,0x59,0xbe,0x62,0x36,0xb3,0x79,0xed,0x0e,0x67,0x3b,0x9b,0x90,0xcf, - 0xb6,0x95,0x20,0xa2,0x55,0xeb,0x2d,0x4a,0x6b,0x5a,0xcf,0xa2,0x16,0xab,0xb8,0x58, - 0x6d,0x58,0x5b,0xeb,0x5a,0xaf,0x56,0x36,0xb6,0x49,0xad,0x0e,0x6d,0x6b,0x4b,0xda, - 0xdb,0x0e,0x35,0xb7,0xba,0xa5,0xe9,0x63,0x7b,0xeb,0xdb,0xdf,0x02,0xd7,0x6e,0xc9, - 0x18,0x6e,0x49,0xff,0xfe,0x61,0x5c,0x8e,0xea,0x35,0xb9,0x6d,0x48,0x0e,0x73,0x3f, - 0x5a,0xdc,0xe7,0x12,0xb4,0x1a,0xd2,0x85,0x24,0x37,0xaa,0xbb,0xcf,0xbb,0x3e,0x37, - 0x37,0xc9,0x9d,0x07,0x70,0x5b,0x13,0xdb,0xa6,0x5a,0x56,0x6d,0xec,0x2a,0x22,0x79, - 0x97,0x6b,0xde,0xf3,0x46,0x57,0x85,0xea,0xa5,0xee,0x0c,0xdb,0xeb,0x5c,0xf6,0xc2, - 0x17,0xb0,0xef,0x9d,0x2f,0x7a,0x5b,0x68,0xdf,0xf5,0xa6,0x37,0xbf,0xb3,0xdd,0x2f, - 0x7f,0x4f,0x5b,0xdf,0xff,0x0a,0x17,0xbf,0x02,0xe6,0x2d,0x81,0x0b,0xdc,0xdf,0x03, - 0x23,0x18,0xc0,0xf2,0x5d,0x70,0x82,0x91,0xe8,0x60,0x06,0xfb,0x37,0xc2,0x0e,0x09, - 0x30,0x85,0x43,0xdb,0xe0,0x0b,0xc7,0xe2,0x33,0x1a,0x96,0xb0,0x82,0x3b,0x5c,0xe1, - 0x0c,0x83,0xb8,0x3c,0x16,0x1e,0x71,0x88,0x27,0x6c,0x62,0x4c,0x70,0x38,0xc5,0xab, - 0x58,0x31,0x8b,0x4f,0xfc,0xe1,0x17,0xc7,0xa7,0xc4,0x32,0x9e,0x08,0x8d,0x6b,0xac, - 0xe2,0x1b,0xe3,0xd8,0x12,0x2e,0xde,0xb1,0x8d,0x45,0xec,0x63,0x1e,0xeb,0x38,0xc8, - 0x8f,0xe8,0x31,0x91,0x85,0x0c,0xe4,0x23,0x17,0x79,0xc8,0x4a,0x0e,0x10,0x93,0x9b, - 0x3c,0x08,0x23,0x43,0x59,0x17,0x4f,0x9e,0xb2,0x48,0xaa,0x6c,0x65,0x60,0x60,0x39, - 0xcb,0x0d,0xda,0x32,0x97,0x4f,0xe2,0xe5,0x2f,0xcb,0x41,0xca,0x62,0x0e,0x04,0x99, - 0xcb,0x9c,0xa0,0x30,0xa3,0x59,0x12,0x6a,0x5e,0xb3,0xc1,0xda,0xec,0xe6,0x84,0xc1, - 0x39,0xce,0x65,0x38,0x33,0x9d,0x23,0x34,0xe7,0x3b,0x3f,0x2c,0xcf,0x7a,0xb6,0x09, - 0x9f,0xfb,0x9c,0xb7,0xa2,0x3f,0x03,0xba,0x62,0x49,0x1e,0x34,0x9b,0x0b,0x6d,0xe8, - 0x37,0x23,0x3a,0xd1,0x72,0x5e,0x34,0xa3,0xeb,0x2c,0xe8,0x47,0x6f,0xcc,0xd1,0x92, - 0xde,0x33,0xa5,0x2b,0xed,0xe7,0x4b,0x63,0x3a,0xd0,0x9a,0xde,0x34,0xa1,0x51,0xec, - 0x69,0x2b,0xd8,0x39,0xd4,0x99,0x06,0x35,0xa9,0x77,0x12,0xe9,0x53,0x9f,0xac,0xd3, - 0xaa,0x9e,0xb4,0xa9,0x5b,0xed,0xea,0x18,0xc3,0xba,0x45,0xa9,0x9e,0x75,0x92,0x58, - 0x6d,0xeb,0x91,0xbd,0x3a,0xd7,0xba,0x96,0x35,0xaf,0x63,0x0d,0xe1,0x5f,0xa3,0x1a, - 0xd7,0xc2,0xee,0xc1,0xa8,0x8b,0xfd,0x31,0x62,0x23,0x5b,0x07,0xc7,0x5e,0x76,0x11, - 0x9a,0xed,0xec,0xa2,0xd4,0x3a,0xda,0x2a,0x80,0x36,0xb5,0x57,0xb6,0xeb,0x6b,0xdf, - 0xc0,0xda,0xda,0xbe,0x75,0xb6,0xbb,0x4d,0x03,0x6e,0x83,0xdb,0x06,0xe2,0x1e,0x77, - 0xb8,0xa7,0x6d,0xee,0x53,0xa0,0x3b,0xdd,0x3f,0x58,0x37,0xbb,0x37,0xe0,0xee,0x77, - 0x7b,0x25,0xde,0xf2,0xbe,0x9a,0xb2,0xeb,0xdd,0xa5,0x7b,0xe3,0x9b,0x04,0xe5,0xde, - 0xf7,0x09,0xfa,0xed,0xef,0xa3,0xd1,0xdb,0x29,0x05,0x00,0x00,0x3b + 0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0x00, 0x02, 0x00, 0x02, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x21, 0xfe, 0x11, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69, + 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x00, 0x21, 0xf9, 0x04, 0x01, 0x0a, 0x00, 0x01, 0x00, + 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0xfe, 0x8c, 0x8f, 0xa9, 0xcb, + 0xed, 0x0f, 0xa3, 0x9c, 0xb4, 0xda, 0x8b, 0x73, 0x06, 0xbc, 0x73, 0x0d, 0x86, 0xe2, 0x48, 0x96, + 0xe6, 0x89, 0xa6, 0xea, 0xca, 0xb6, 0xae, 0xe9, 0xc5, 0xf1, 0x4b, 0xd7, 0xf6, 0x8d, 0xe7, 0xfa, + 0xce, 0xf7, 0xa0, 0x0c, 0x9c, 0xf9, 0x86, 0xc4, 0xa2, 0xf1, 0x88, 0x4c, 0x2a, 0x27, 0xc1, 0x66, + 0x67, 0x09, 0x8d, 0x4a, 0xa7, 0xd4, 0x6a, 0xd5, 0x89, 0x05, 0x58, 0xb7, 0xdc, 0xae, 0xf7, 0x0b, + 0x8e, 0x64, 0xb3, 0xe1, 0xb2, 0xf9, 0x8c, 0x4e, 0xd7, 0xc6, 0x63, 0xb5, 0xfb, 0x0d, 0x8f, 0xcb, + 0x0d, 0x6c, 0xf6, 0xfc, 0x8e, 0xcf, 0xeb, 0x8d, 0xf5, 0xfa, 0xfe, 0x0f, 0x18, 0x28, 0x38, 0xd2, + 0xd7, 0x37, 0x78, 0x88, 0x98, 0x98, 0x58, 0x58, 0xa8, 0xe8, 0xf8, 0x08, 0xe9, 0xc6, 0xc8, 0x18, + 0x59, 0x69, 0x79, 0x29, 0x35, 0x39, 0x89, 0xc9, 0xd9, 0xe9, 0x89, 0xa3, 0xa9, 0xf9, 0x39, 0x4a, + 0x5a, 0x2a, 0x12, 0x1a, 0x6a, 0xaa, 0xba, 0xca, 0xba, 0x80, 0x8a, 0xda, 0x1a, 0x2b, 0xfb, 0xf9, + 0xfa, 0x3a, 0x7b, 0x8b, 0xeb, 0x58, 0x5b, 0x9b, 0xdb, 0xeb, 0xbb, 0xb7, 0x6b, 0xfb, 0x3b, 0x4c, + 0xac, 0x16, 0xcc, 0x5b, 0x9c, 0xac, 0xcc, 0x75, 0xbc, 0xbb, 0xfc, 0x0c, 0xad, 0xd4, 0x1c, 0x1c, + 0x5d, 0x6d, 0xbd, 0x33, 0x7d, 0x7c, 0xbd, 0xcd, 0xcd, 0x92, 0xdd, 0xdc, 0x1d, 0x2e, 0x1e, 0xf2, + 0x3d, 0x3d, 0x7e, 0x8e, 0x2e, 0x56, 0x6e, 0x9e, 0xde, 0xee, 0x1e, 0xb0, 0xfe, 0xfd, 0x3e, 0x2f, + 0x1e, 0x5f, 0x4e, 0x8f, 0x6f, 0x6d, 0xbf, 0x9e, 0xdf, 0xaf, 0xbc, 0x1f, 0xcf, 0x9f, 0x40, 0x5f, + 0x00, 0xed, 0x0d, 0x3c, 0x28, 0xab, 0xe0, 0x3e, 0x84, 0x0c, 0x4d, 0x29, 0x04, 0xd8, 0x30, 0x62, + 0xa7, 0x87, 0x05, 0x25, 0x5a, 0x8c, 0x44, 0x51, 0xe1, 0xc5, 0xfe, 0x8d, 0x8b, 0x32, 0x42, 0xe4, + 0x08, 0x12, 0x90, 0x47, 0x8d, 0x21, 0x4b, 0xde, 0x19, 0xf9, 0xd0, 0xa4, 0xca, 0x37, 0x28, 0x29, + 0xae, 0x7c, 0x69, 0xa6, 0x65, 0x46, 0x98, 0x34, 0xbb, 0xc8, 0xf4, 0x58, 0x33, 0xe7, 0x94, 0x9b, + 0x23, 0x75, 0xfa, 0x4c, 0xc2, 0x13, 0xe5, 0xcf, 0xa1, 0x43, 0x82, 0xb6, 0x24, 0x8a, 0x34, 0x87, + 0x51, 0x99, 0x49, 0x9b, 0xbe, 0x58, 0x7a, 0xd3, 0xa9, 0xd4, 0x14, 0x50, 0x79, 0x4e, 0xbd, 0x4a, + 0xa8, 0xaa, 0x55, 0xac, 0x5c, 0x2f, 0x68, 0x35, 0xda, 0x35, 0xac, 0x84, 0xaf, 0x4b, 0xc5, 0x9a, + 0x65, 0x40, 0x16, 0xea, 0xd9, 0xb5, 0x07, 0xd2, 0x96, 0x65, 0x7b, 0xd6, 0xad, 0x5a, 0xb8, 0x61, + 0xe5, 0x56, 0xa5, 0xcb, 0xd5, 0xae, 0x56, 0xbc, 0x53, 0xf5, 0x7e, 0xe5, 0xdb, 0xd4, 0x2f, 0x59, + 0xc0, 0x44, 0x05, 0xa7, 0x25, 0xec, 0xd3, 0xb0, 0x5b, 0xc4, 0x35, 0x15, 0xcb, 0x65, 0xfc, 0xd2, + 0xb1, 0x5d, 0xc8, 0x26, 0x25, 0xeb, 0xa5, 0x0c, 0xd2, 0xb2, 0x5f, 0xcc, 0x17, 0x35, 0x0b, 0xe6, + 0x1c, 0xd1, 0xb3, 0x61, 0xd0, 0x08, 0x45, 0x2b, 0x26, 0x2d, 0xd0, 0xb4, 0x63, 0xd4, 0xfd, 0x54, + 0x9f, 0x66, 0x4d, 0xcf, 0xf5, 0x6a, 0xd8, 0xee, 0x64, 0x4b, 0xa6, 0x9d, 0xce, 0xb6, 0x65, 0xdc, + 0xe3, 0x74, 0x6b, 0xe6, 0xdd, 0xcd, 0xb7, 0x67, 0xe0, 0xd7, 0x84, 0x8b, 0x26, 0x1e, 0xcd, 0xb8, + 0x69, 0xe4, 0xcb, 0x94, 0xab, 0x66, 0x5e, 0xcc, 0xb9, 0x6b, 0xe8, 0xbf, 0xa4, 0xcb, 0xa6, 0x9e, + 0xcb, 0xba, 0x6d, 0xec, 0xb3, 0xb4, 0xeb, 0xe6, 0xde, 0xca, 0xbb, 0x6f, 0xf0, 0xaa, 0xc4, 0x0b, + 0x27, 0x4f, 0xca, 0xbc, 0x71, 0xf4, 0x9e, 0xd4, 0xaf, 0x67, 0xcf, 0xc9, 0xfd, 0x7b, 0xf8, 0x95, + 0xe4, 0x2b, 0xa7, 0x8f, 0xd1, 0xfe, 0x7d, 0xfc, 0x8a, 0xfe, 0xf4, 0x4b, 0xe7, 0x8f, 0x88, 0x7f, + 0xd6, 0x01, 0x28, 0x88, 0x80, 0xda, 0x11, 0xf8, 0x87, 0x81, 0xde, 0x21, 0x98, 0x87, 0x82, 0xe2, + 0x31, 0x38, 0x87, 0x83, 0xe6, 0x41, 0x08, 0x87, 0x84, 0xea, 0x51, 0x68, 0x8c, 0x85, 0x17, 0x62, + 0x18, 0x93, 0x86, 0xee, 0x71, 0x18, 0x86, 0x87, 0xf6, 0x81, 0xe8, 0x85, 0x88, 0xfa, 0x91, 0xb8, + 0x85, 0x89, 0xfe, 0xa1, 0x48, 0x85, 0x8a, 0x02, 0xb2, 0x98, 0x89, 0x8b, 0x27, 0xc2, 0xb8, 0x84, + 0x8c, 0x2f, 0xd2, 0x88, 0x84, 0x8d, 0x06, 0xe2, 0xc8, 0x87, 0x8e, 0x3b, 0xf2, 0xe8, 0x83, 0x8f, + 0x0e, 0x02, 0xc9, 0x83, 0x90, 0x12, 0x12, 0xa9, 0x94, 0x91, 0x47, 0x22, 0xb9, 0x86, 0x92, 0x16, + 0x32, 0xf9, 0x94, 0x93, 0x1a, 0x42, 0xe9, 0x8d, 0x94, 0x1e, 0x52, 0x49, 0x95, 0x95, 0x22, 0x62, + 0x09, 0x83, 0x96, 0x26, 0x72, 0x99, 0x95, 0x97, 0x5f, 0x82, 0xa9, 0x81, 0x98, 0x32, 0x92, 0x89, + 0x81, 0x99, 0x36, 0xa2, 0x59, 0x81, 0x9a, 0x3a, 0xb2, 0xc9, 0x84, 0x9b, 0x67, 0xc2, 0x09, 0x81, + 0x9c, 0x6f, 0xd2, 0xd9, 0x80, 0x9d, 0x3e, 0xe2, 0xe9, 0x8a, 0x9e, 0x7b, 0xf2, 0xd9, 0x96, 0x9f, + 0x42, 0x02, 0x0a, 0x8f, 0xa0, 0x46, 0xf2, 0x69, 0xa8, 0x93, 0x74, 0x26, 0x2a, 0x25, 0x9b, 0x8c, + 0x5a, 0x89, 0xe6, 0xa3, 0x8d, 0x82, 0x29, 0x29, 0xa4, 0x58, 0x56, 0xaa, 0xe5, 0xa5, 0x98, 0x4e, + 0x0a, 0xe5, 0xa6, 0x9c, 0x22, 0xe9, 0xa9, 0xa5, 0xa0, 0x86, 0xaa, 0x28, 0x93, 0xa4, 0x96, 0x4a, + 0xe4, 0xa9, 0x9f, 0xe2, 0xa8, 0x2a, 0xaa, 0x3c, 0xb6, 0xaa, 0xe4, 0xa8, 0xb0, 0xfe, 0x09, 0xe4, + 0xac, 0x83, 0xa6, 0x6a, 0xeb, 0x9d, 0xb5, 0xe6, 0xba, 0x26, 0xae, 0xbc, 0xba, 0x28, 0xeb, 0xaf, + 0x63, 0xfa, 0x2a, 0xec, 0x94, 0xa6, 0x16, 0x7b, 0xfe, 0xe5, 0xb1, 0xc8, 0x3e, 0xd9, 0xe9, 0xb2, + 0x43, 0x52, 0xe9, 0xec, 0xb3, 0xcd, 0x46, 0x7b, 0x23, 0xb4, 0xd4, 0xce, 0xa8, 0xe9, 0xb5, 0x1f, + 0x92, 0xa9, 0xed, 0xb6, 0xdc, 0x76, 0xbb, 0x20, 0x9c, 0xe0, 0x0e, 0x88, 0xe7, 0xb8, 0xfb, 0x21, + 0x6a, 0xee, 0x77, 0x84, 0x16, 0x9a, 0xee, 0x73, 0xeb, 0x06, 0xda, 0xee, 0x6e, 0xef, 0x26, 0x10, + 0xef, 0x6d, 0xf3, 0xa2, 0x55, 0xef, 0x63, 0xf7, 0xaa, 0x93, 0xef, 0x5b, 0xfb, 0x16, 0xe9, 0xec, + 0xbf, 0x2c, 0x51, 0x2b, 0x70, 0x1a, 0xdd, 0x16, 0x7c, 0xc6, 0xc1, 0x08, 0x87, 0x08, 0xee, 0xc2, + 0x5f, 0xa4, 0xeb, 0x30, 0x33, 0xed, 0x46, 0x7c, 0x45, 0xbd, 0x14, 0xc7, 0x98, 0xef, 0xc5, 0x35, + 0xf6, 0xfb, 0x81, 0xc6, 0x39, 0x72, 0xac, 0x85, 0xc7, 0x3d, 0x82, 0x1c, 0xb2, 0xc8, 0x41, 0x92, + 0xfc, 0x84, 0xc9, 0x00, 0xa3, 0x9c, 0xb2, 0xca, 0xa0, 0xb0, 0x2c, 0x84, 0xcb, 0x4d, 0xc2, 0x1c, + 0xb3, 0xcc, 0x2d, 0xd0, 0x1c, 0x84, 0xcd, 0x2e, 0xe0, 0x0c, 0x84, 0xce, 0x55, 0xf2, 0x2c, 0x83, + 0xcf, 0x59, 0x02, 0xdd, 0xb3, 0xd0, 0x25, 0x10, 0xed, 0x84, 0xd1, 0x61, 0x22, 0x9d, 0xb3, 0xd2, + 0x65, 0x32, 0x8d, 0x85, 0xd3, 0x69, 0x42, 0x4d, 0x86, 0xd4, 0x6d, 0x52, 0x1d, 0xb5, 0xd5, 0x71, + 0x62, 0x9d, 0xb5, 0xd6, 0x0f, 0x70, 0x6d, 0x87, 0xd7, 0x79, 0x82, 0x1d, 0xb6, 0xd8, 0xf4, 0x92, + 0xed, 0x87, 0xd9, 0xf0, 0xa2, 0x5d, 0xb6, 0xd8, 0x6c, 0x53, 0x62, 0xf6, 0xdb, 0x8d, 0xb8, 0x2d, + 0xf7, 0xdc, 0x56, 0xd7, 0xbd, 0x89, 0xd4, 0x78, 0x8b, 0xa2, 0xf4, 0xde, 0xa9, 0x08, 0xed, 0x37, + 0x2c, 0x3a, 0x07, 0x2e, 0x8c, 0xcb, 0x84, 0x23, 0xa3, 0xf2, 0xe1, 0x85, 0x8b, 0xac, 0x38, 0xe2, + 0x1a, 0x37, 0xee, 0xcc, 0xe3, 0x90, 0x47, 0xfe, 0x1e, 0xf1, 0xe4, 0xda, 0x38, 0x6c, 0x39, 0x38, + 0x08, 0x67, 0xce, 0x8e, 0xc0, 0x9c, 0x6b, 0xfe, 0xef, 0xe7, 0x9d, 0xcf, 0x2b, 0x7a, 0x36, 0xf7, + 0x96, 0x2e, 0xcf, 0xba, 0xa8, 0xdf, 0x03, 0xe8, 0xea, 0xfc, 0x94, 0xeb, 0xfa, 0xeb, 0xe2, 0xc6, + 0xce, 0xba, 0xa3, 0xb4, 0xcb, 0x4e, 0xe9, 0xed, 0x01, 0xe5, 0xae, 0xfb, 0xee, 0xd6, 0xf6, 0x6e, + 0xd0, 0xb4, 0xc0, 0x07, 0x4f, 0xec, 0xf0, 0xc4, 0xbf, 0x6a, 0xfc, 0x47, 0xc8, 0x27, 0xaf, 0x3c, + 0x8c, 0xcc, 0xa7, 0xe4, 0xfc, 0xf3, 0xd0, 0x93, 0x28, 0xfd, 0x4c, 0x20, 0x56, 0x8f, 0x13, 0x86, + 0xd8, 0xf7, 0x44, 0xe1, 0xf6, 0xd9, 0x33, 0xe8, 0x3d, 0xf7, 0x04, 0x86, 0x2f, 0x14, 0x80, 0xe4, + 0x1f, 0x85, 0xdf, 0xf9, 0x4c, 0xc1, 0xa7, 0x7e, 0x54, 0xe8, 0xb5, 0xbf, 0x15, 0x78, 0xf0, 0xbb, + 0xcf, 0xdd, 0xfc, 0xf1, 0x43, 0x67, 0x7f, 0x50, 0xd4, 0xe5, 0x0f, 0x16, 0x72, 0xfc, 0xfb, 0x8b, + 0x9b, 0xff, 0xcd, 0x85, 0x36, 0x02, 0xbc, 0x0b, 0x01, 0x0b, 0x08, 0x40, 0xd2, 0x20, 0xd0, 0x80, + 0x0a, 0x5c, 0x20, 0x03, 0x31, 0xe3, 0xc0, 0xbf, 0x40, 0x30, 0x82, 0x12, 0x64, 0x0c, 0x05, 0x0f, + 0x83, 0x98, 0x0b, 0x2e, 0x86, 0x30, 0x1a, 0xc4, 0x20, 0x5f, 0x3a, 0xb8, 0x41, 0xba, 0x80, 0x50, + 0x5f, 0x6c, 0x19, 0xe1, 0x64, 0xd6, 0x62, 0xc2, 0xcb, 0xc4, 0x25, 0x85, 0x24, 0xac, 0x0b, 0x0b, + 0x4f, 0xd8, 0x95, 0x17, 0x6e, 0x26, 0x86, 0x32, 0x84, 0x21, 0x56, 0x6a, 0x68, 0xc3, 0xbe, 0xe0, + 0x30, 0x87, 0x4e, 0xd9, 0x21, 0x0f, 0x03, 0xe3, 0xc3, 0x10, 0x4a, 0x25, 0x88, 0x3f, 0x2c, 0x0c, + 0x11, 0x85, 0x08, 0xc4, 0x23, 0x0e, 0x46, 0x87, 0x4a, 0xac, 0x60, 0x0f, 0x9b, 0xe8, 0xc4, 0x24, + 0x42, 0x71, 0x80, 0x4f, 0x9c, 0x22, 0xfe, 0x15, 0xa5, 0x68, 0x45, 0xfd, 0x31, 0x31, 0x8b, 0x5a, + 0xdc, 0x22, 0x17, 0xd1, 0x77, 0x95, 0x2f, 0xde, 0x6f, 0x88, 0x62, 0x5c, 0xdf, 0x0d, 0xcb, 0x28, + 0xbe, 0x33, 0xa2, 0xd1, 0x7a, 0x79, 0x59, 0x23, 0x1b, 0xdb, 0xe8, 0xc6, 0x8a, 0x98, 0x25, 0x8e, + 0xcd, 0x73, 0x21, 0x1d, 0x7d, 0x37, 0xc7, 0x3b, 0xd6, 0x0e, 0x85, 0x7a, 0x1c, 0x5d, 0x09, 0xfb, + 0x48, 0x0d, 0xc0, 0x00, 0xd2, 0x71, 0x1f, 0x1c, 0x24, 0xdf, 0x20, 0x63, 0x48, 0x43, 0x34, 0x30, + 0x91, 0x49, 0x83, 0x0d, 0x23, 0x83, 0xe6, 0xbf, 0x44, 0x7e, 0x8b, 0x76, 0x46, 0x03, 0x9e, 0xcf, + 0x8c, 0x67, 0x33, 0xe6, 0xc9, 0x4c, 0x93, 0x89, 0x7b, 0x9e, 0xc9, 0xb0, 0xe7, 0x31, 0xef, 0x5d, + 0x8c, 0x7c, 0x95, 0x3b, 0xdf, 0xc2, 0xe0, 0x57, 0x30, 0xfb, 0x79, 0x6e, 0x7e, 0xa1, 0xcb, 0xdf, + 0xe9, 0xfe, 0xf7, 0x2e, 0x04, 0x12, 0xca, 0x81, 0xe8, 0xa2, 0xe5, 0xec, 0x28, 0x68, 0x3b, 0x0d, + 0x4e, 0xb2, 0x83, 0xbc, 0xe3, 0x65, 0xb6, 0x46, 0xf8, 0xbb, 0x14, 0x2a, 0xeb, 0x85, 0xc5, 0x23, + 0x26, 0xab, 0x82, 0x48, 0x23, 0x25, 0xb2, 0x08, 0x8a, 0x28, 0x62, 0xe6, 0xf5, 0xa6, 0xc8, 0x21, + 0x2e, 0x76, 0xef, 0x8b, 0xe0, 0x2b, 0xe3, 0xf8, 0xd6, 0xc8, 0x1f, 0x3a, 0xd2, 0x47, 0x8f, 0xec, + 0x01, 0xe4, 0xfb, 0xfa, 0x48, 0x1e, 0x43, 0xd6, 0x4f, 0x92, 0xf8, 0x7b, 0x24, 0x73, 0x1e, 0xd9, + 0xb2, 0x00, 0xa2, 0x33, 0x9d, 0xac, 0x59, 0x67, 0xcd, 0x16, 0xe9, 0x4e, 0x76, 0x72, 0x26, 0x9e, + 0xef, 0x9c, 0x20, 0x3d, 0x3d, 0x00, 0xcf, 0x7b, 0xca, 0x93, 0x83, 0xfa, 0x2c, 0x9a, 0x05, 0xfb, + 0xd9, 0x34, 0x7e, 0x02, 0x34, 0xa0, 0x78, 0x19, 0x68, 0xd7, 0xe0, 0x62, 0xd0, 0xaa, 0xfd, 0x31, + 0xa1, 0x07, 0xcd, 0x23, 0x43, 0xfe, 0x1b, 0xb9, 0xc2, 0x87, 0x36, 0x14, 0x8e, 0x12, 0x9d, 0xa8, + 0x17, 0x2b, 0x0a, 0xd1, 0x30, 0x62, 0x34, 0x6d, 0x17, 0xdd, 0xa8, 0x45, 0x87, 0xe2, 0x51, 0xb8, + 0x25, 0x25, 0xa4, 0x79, 0x43, 0x0a, 0x49, 0x45, 0x0a, 0xd2, 0x93, 0xa2, 0x54, 0x27, 0x2a, 0x3d, + 0x64, 0x4e, 0x5a, 0xfa, 0xb7, 0xc6, 0xc0, 0x34, 0xa6, 0x91, 0x99, 0xa9, 0xe0, 0x56, 0x62, 0x53, + 0x42, 0x66, 0x26, 0xa7, 0x3a, 0xed, 0x0c, 0x4f, 0x29, 0xc7, 0x91, 0x9f, 0x02, 0xd5, 0xa7, 0x42, + 0xed, 0x29, 0x43, 0x8a, 0x7a, 0x39, 0x89, 0x20, 0x15, 0x74, 0x47, 0x5d, 0x2a, 0x53, 0x07, 0xe2, + 0x54, 0xd3, 0x1d, 0x24, 0xaa, 0xa9, 0xf3, 0x07, 0x55, 0xf7, 0x88, 0x8f, 0xab, 0x56, 0x35, 0xab, + 0x5a, 0xdd, 0xea, 0x3b, 0xba, 0x8a, 0xbb, 0x76, 0x80, 0x15, 0x8f, 0xe8, 0x18, 0xeb, 0xf1, 0x7a, + 0x63, 0xd6, 0xb3, 0x06, 0x27, 0xad, 0x0b, 0xa9, 0x07, 0x5b, 0xeb, 0xa8, 0x8f, 0xb7, 0xca, 0x71, + 0x1b, 0x72, 0x9d, 0x6b, 0x5c, 0xeb, 0x0a, 0xd7, 0xe6, 0xe0, 0x95, 0x24, 0xd0, 0xd8, 0xab, 0x4b, + 0x9e, 0xe1, 0xd7, 0x37, 0x46, 0x27, 0xb0, 0xd3, 0x1b, 0x2c, 0x61, 0x0b, 0x3b, 0x8c, 0xc3, 0xfe, + 0x95, 0x18, 0x8a, 0x5d, 0x6c, 0x62, 0x1b, 0x8b, 0xd8, 0x5e, 0x40, 0x36, 0xb2, 0xd9, 0x99, 0xac, + 0x5d, 0x25, 0x6b, 0x59, 0xbe, 0x62, 0x36, 0xb3, 0x79, 0xed, 0x0e, 0x67, 0x3b, 0x9b, 0x90, 0xcf, + 0xb6, 0x95, 0x20, 0xa2, 0x55, 0xeb, 0x2d, 0x4a, 0x6b, 0x5a, 0xcf, 0xa2, 0x16, 0xab, 0xb8, 0x58, + 0x6d, 0x58, 0x5b, 0xeb, 0x5a, 0xaf, 0x56, 0x36, 0xb6, 0x49, 0xad, 0x0e, 0x6d, 0x6b, 0x4b, 0xda, + 0xdb, 0x0e, 0x35, 0xb7, 0xba, 0xa5, 0xe9, 0x63, 0x7b, 0xeb, 0xdb, 0xdf, 0x02, 0xd7, 0x6e, 0xc9, + 0x18, 0x6e, 0x49, 0xff, 0xfe, 0x61, 0x5c, 0x8e, 0xea, 0x35, 0xb9, 0x6d, 0x48, 0x0e, 0x73, 0x3f, + 0x5a, 0xdc, 0xe7, 0x12, 0xb4, 0x1a, 0xd2, 0x85, 0x24, 0x37, 0xaa, 0xbb, 0xcf, 0xbb, 0x3e, 0x37, + 0x37, 0xc9, 0x9d, 0x07, 0x70, 0x5b, 0x13, 0xdb, 0xa6, 0x5a, 0x56, 0x6d, 0xec, 0x2a, 0x22, 0x79, + 0x97, 0x6b, 0xde, 0xf3, 0x46, 0x57, 0x85, 0xea, 0xa5, 0xee, 0x0c, 0xdb, 0xeb, 0x5c, 0xf6, 0xc2, + 0x17, 0xb0, 0xef, 0x9d, 0x2f, 0x7a, 0x5b, 0x68, 0xdf, 0xf5, 0xa6, 0x37, 0xbf, 0xb3, 0xdd, 0x2f, + 0x7f, 0x4f, 0x5b, 0xdf, 0xff, 0x0a, 0x17, 0xbf, 0x02, 0xe6, 0x2d, 0x81, 0x0b, 0xdc, 0xdf, 0x03, + 0x23, 0x18, 0xc0, 0xf2, 0x5d, 0x70, 0x82, 0x91, 0xe8, 0x60, 0x06, 0xfb, 0x37, 0xc2, 0x0e, 0x09, + 0x30, 0x85, 0x43, 0xdb, 0xe0, 0x0b, 0xc7, 0xe2, 0x33, 0x1a, 0x96, 0xb0, 0x82, 0x3b, 0x5c, 0xe1, + 0x0c, 0x83, 0xb8, 0x3c, 0x16, 0x1e, 0x71, 0x88, 0x27, 0x6c, 0x62, 0x4c, 0x70, 0x38, 0xc5, 0xab, + 0x58, 0x31, 0x8b, 0x4f, 0xfc, 0xe1, 0x17, 0xc7, 0xa7, 0xc4, 0x32, 0x9e, 0x08, 0x8d, 0x6b, 0xac, + 0xe2, 0x1b, 0xe3, 0xd8, 0x12, 0x2e, 0xde, 0xb1, 0x8d, 0x45, 0xec, 0x63, 0x1e, 0xeb, 0x38, 0xc8, + 0x8f, 0xe8, 0x31, 0x91, 0x85, 0x0c, 0xe4, 0x23, 0x17, 0x79, 0xc8, 0x4a, 0x0e, 0x10, 0x93, 0x9b, + 0x3c, 0x08, 0x23, 0x43, 0x59, 0x17, 0x4f, 0x9e, 0xb2, 0x48, 0xaa, 0x6c, 0x65, 0x60, 0x60, 0x39, + 0xcb, 0x0d, 0xda, 0x32, 0x97, 0x4f, 0xe2, 0xe5, 0x2f, 0xcb, 0x41, 0xca, 0x62, 0x0e, 0x04, 0x99, + 0xcb, 0x9c, 0xa0, 0x30, 0xa3, 0x59, 0x12, 0x6a, 0x5e, 0xb3, 0xc1, 0xda, 0xec, 0xe6, 0x84, 0xc1, + 0x39, 0xce, 0x65, 0x38, 0x33, 0x9d, 0x23, 0x34, 0xe7, 0x3b, 0x3f, 0x2c, 0xcf, 0x7a, 0xb6, 0x09, + 0x9f, 0xfb, 0x9c, 0xb7, 0xa2, 0x3f, 0x03, 0xba, 0x62, 0x49, 0x1e, 0x34, 0x9b, 0x0b, 0x6d, 0xe8, + 0x37, 0x23, 0x3a, 0xd1, 0x72, 0x5e, 0x34, 0xa3, 0xeb, 0x2c, 0xe8, 0x47, 0x6f, 0xcc, 0xd1, 0x92, + 0xde, 0x33, 0xa5, 0x2b, 0xed, 0xe7, 0x4b, 0x63, 0x3a, 0xd0, 0x9a, 0xde, 0x34, 0xa1, 0x51, 0xec, + 0x69, 0x2b, 0xd8, 0x39, 0xd4, 0x99, 0x06, 0x35, 0xa9, 0x77, 0x12, 0xe9, 0x53, 0x9f, 0xac, 0xd3, + 0xaa, 0x9e, 0xb4, 0xa9, 0x5b, 0xed, 0xea, 0x18, 0xc3, 0xba, 0x45, 0xa9, 0x9e, 0x75, 0x92, 0x58, + 0x6d, 0xeb, 0x91, 0xbd, 0x3a, 0xd7, 0xba, 0x96, 0x35, 0xaf, 0x63, 0x0d, 0xe1, 0x5f, 0xa3, 0x1a, + 0xd7, 0xc2, 0xee, 0xc1, 0xa8, 0x8b, 0xfd, 0x31, 0x62, 0x23, 0x5b, 0x07, 0xc7, 0x5e, 0x76, 0x11, + 0x9a, 0xed, 0xec, 0xa2, 0xd4, 0x3a, 0xda, 0x2a, 0x80, 0x36, 0xb5, 0x57, 0xb6, 0xeb, 0x6b, 0xdf, + 0xc0, 0xda, 0xda, 0xbe, 0x75, 0xb6, 0xbb, 0x4d, 0x03, 0x6e, 0x83, 0xdb, 0x06, 0xe2, 0x1e, 0x77, + 0xb8, 0xa7, 0x6d, 0xee, 0x53, 0xa0, 0x3b, 0xdd, 0x3f, 0x58, 0x37, 0xbb, 0x37, 0xe0, 0xee, 0x77, + 0x7b, 0x25, 0xde, 0xf2, 0xbe, 0x9a, 0xb2, 0xeb, 0xdd, 0xa5, 0x7b, 0xe3, 0x9b, 0x04, 0xe5, 0xde, + 0xf7, 0x09, 0xfa, 0xed, 0xef, 0xa3, 0xd1, 0xdb, 0x29, 0x05, 0x00, 0x00, 0x3b }; diff --git a/src/utils/gui/images/textures/POITextures/Pin.cpp b/src/utils/gui/images/textures/POITextures/Pin.cpp index cf00d70262cf..05915df77eee 100644 --- a/src/utils/gui/images/textures/POITextures/Pin.cpp +++ b/src/utils/gui/images/textures/POITextures/Pin.cpp @@ -21,164 +21,164 @@ const unsigned char POITexture_Pin[] = { - 0x47,0x49,0x46,0x38,0x39,0x61,0x00,0x02,0x00,0x02,0x80,0x01,0x00,0x00,0x00,0x00, - 0xff,0xff,0xff,0x21,0xfe,0x11,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69, - 0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x00,0x21,0xf9,0x04,0x01,0x0a,0x00,0x01,0x00, - 0x2c,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x02,0x00,0x02,0xfe,0x8c,0x8f,0xa9,0xcb, - 0xed,0x0f,0xa3,0x9c,0xb4,0xda,0x8b,0x33,0x04,0xbc,0xfb,0x0f,0x7e,0xda,0x48,0x96, - 0xe6,0x89,0xa6,0xea,0xca,0xb6,0xee,0x0b,0xc7,0x48,0x48,0xd7,0xf6,0xcd,0xc9,0xfa, - 0xce,0xf7,0xfe,0x0f,0x0c,0x0a,0x59,0xb8,0xa2,0xf1,0x48,0x1b,0x2a,0x97,0xcc,0xa6, - 0xf3,0x09,0x6d,0x21,0xa7,0xd4,0x6a,0x2e,0x8a,0xcd,0x6a,0xb7,0xdc,0x6e,0xc6,0x0a, - 0x0e,0x5b,0xbd,0xe4,0xb2,0xf9,0x8c,0x5e,0x89,0xd7,0xec,0x71,0xfa,0x0d,0x8f,0xcb, - 0xb7,0xed,0xba,0xbd,0x3a,0xcf,0xeb,0xf7,0xfc,0xd4,0xfd,0x0f,0x88,0xd4,0x37,0x48, - 0x58,0x38,0x18,0x88,0x98,0x78,0x64,0xc8,0xd8,0xe8,0x88,0xa5,0x18,0x29,0x89,0xf3, - 0x58,0x69,0x79,0xf9,0x32,0xa9,0xb9,0x59,0x83,0xe9,0xf9,0x09,0x1a,0xc1,0x39,0x4a, - 0x0a,0x12,0x7a,0x8a,0x7a,0x59,0xba,0xca,0x0a,0x90,0xfa,0x0a,0xab,0xd7,0x3a,0xdb, - 0x1a,0x6b,0x7b,0xdb,0x45,0xab,0x5b,0x8b,0xdb,0xeb,0x2b,0xb4,0x1b,0x4c,0xfb,0x4b, - 0x5c,0xec,0x22,0x8c,0x3c,0x6c,0xbc,0xcc,0x8c,0x91,0xfc,0xac,0xdc,0x2c,0x3d,0xad, - 0x00,0x6d,0x1d,0x4d,0x9d,0x6d,0x7c,0xcd,0x8d,0xad,0xfd,0x1d,0xdb,0x2d,0xee,0x0d, - 0x5e,0xee,0x39,0x8e,0x4e,0x6e,0xbe,0x6e,0x98,0xee,0xae,0xce,0x1e,0x3f,0xf7,0x4e, - 0x0f,0x2f,0x7f,0x5f,0x56,0xaf,0x6f,0x8f,0xdf,0x1f,0xb5,0x0f,0x90,0x9f,0xbf,0x81, - 0x43,0x02,0x1a,0xe4,0x45,0x30,0xa1,0x92,0x83,0x0c,0x11,0x2a,0x7c,0xb8,0xa3,0xa1, - 0x44,0x87,0x10,0x2b,0x12,0x99,0x88,0xb1,0x94,0xc5,0xfe,0x8d,0x7e,0x32,0x7a,0xd4, - 0xc8,0x31,0xe4,0x97,0x8f,0x24,0x47,0x89,0x3c,0x39,0xa1,0xa4,0x4a,0x52,0x28,0x5b, - 0x32,0x58,0x09,0x93,0x93,0xcb,0x99,0x01,0x62,0xda,0x94,0x49,0x53,0xe4,0xcd,0x9d, - 0x9a,0x72,0x6e,0xe4,0x09,0xb4,0xa7,0x4f,0x85,0x41,0x8b,0x4a,0x1a,0x4a,0xd0,0xa8, - 0x52,0x45,0x48,0xf1,0x2d,0x7d,0xca,0xb4,0xe9,0x3a,0xa8,0x54,0x11,0x49,0x2d,0x57, - 0x35,0x2b,0xa0,0xab,0xda,0xb4,0x7a,0xbd,0xc3,0x55,0xda,0xd7,0xb1,0x60,0xc3,0x16, - 0x23,0x8b,0xb6,0x8e,0xd9,0x5f,0x69,0xdb,0xb2,0x59,0x8b,0xcb,0xad,0x5c,0x31,0x70, - 0xc3,0xcd,0xbd,0xeb,0xa6,0x6e,0x28,0xbc,0x7c,0xc1,0xe8,0xfd,0xd4,0x37,0x30,0x9e, - 0xbf,0x96,0x04,0x1b,0x9e,0x42,0xf8,0xd1,0xe1,0xc5,0x8b,0x12,0xb7,0x63,0x0c,0x99, - 0x92,0xe3,0x43,0x91,0x2b,0xdb,0x98,0xcc,0xc7,0xb2,0xe6,0x4e,0x98,0xe7,0x6d,0xfe, - 0x6c,0xaa,0x33,0x1c,0xd0,0xa4,0x45,0x88,0x46,0x53,0x3a,0x75,0x87,0xd3,0x66,0x54, - 0xbb,0x76,0xc5,0x3a,0xd7,0x6b,0xd7,0xb1,0xe9,0xcc,0x7e,0x5d,0x1b,0xd2,0xed,0xd9, - 0xb9,0x9f,0xec,0xde,0xdd,0x9b,0xc9,0xef,0xdf,0xc1,0x0b,0x0e,0x07,0x5e,0x3c,0xc8, - 0x71,0xe2,0xc9,0x7d,0x2c,0x1f,0xde,0x9c,0xc7,0xf3,0xe3,0xd1,0x65,0x4c,0x5f,0x5e, - 0x3d,0xd3,0x75,0xec,0xd9,0xd5,0x6c,0x7f,0xde,0x5d,0xc5,0x77,0xf0,0xe1,0x4f,0x8c, - 0x9f,0x5e,0xbe,0xc4,0xf9,0xeb,0xe9,0x35,0xac,0xdf,0xde,0xfe,0xc2,0xfb,0xef,0xf1, - 0x2b,0xcc,0x87,0x5f,0x5f,0xc2,0x7d,0xfa,0xf9,0xfe,0x1f,0xec,0x1f,0xdf,0x5f,0x03, - 0xff,0x9d,0x17,0xe0,0x02,0x03,0x02,0x58,0xe0,0x0c,0x07,0x22,0x98,0xe0,0x82,0xeb, - 0x25,0x58,0x93,0x83,0x0c,0xf6,0x27,0xe1,0x83,0x14,0x56,0x68,0x61,0x7d,0x18,0x66, - 0xd8,0xde,0x86,0xef,0xc5,0xe7,0xe1,0x7c,0x1d,0x86,0xc8,0x61,0x76,0x24,0x8a,0xd8, - 0xdd,0x89,0xf7,0xa5,0xa8,0xe2,0x87,0xd5,0xb5,0xb8,0x62,0x74,0x30,0xa2,0x98,0xdc, - 0x8c,0x31,0x06,0x67,0xe3,0x7e,0xc5,0xe5,0x78,0x63,0x6d,0x3c,0xea,0x98,0xdb,0x8f, - 0x3d,0x9e,0x26,0x24,0x90,0xac,0x15,0x39,0x24,0x66,0x48,0x1a,0xd9,0xd9,0x92,0x49, - 0x26,0xe6,0x24,0x93,0x8e,0x45,0xf9,0xa4,0x5e,0x54,0x4a,0xf9,0xd7,0x95,0x55,0xae, - 0xa5,0x25,0x96,0x70,0x75,0xb9,0x25,0x57,0x60,0x7a,0x19,0xd6,0x98,0x61,0x36,0x65, - 0x26,0x99,0x52,0xa5,0x79,0xa6,0x4f,0x6c,0xaa,0x39,0xd4,0x9b,0x6d,0xce,0x24,0x27, - 0x9c,0x34,0xd5,0x39,0x67,0x4b,0x78,0xd2,0xb8,0xe6,0x9e,0x7c,0x22,0xe5,0xe7,0x9f, - 0x6e,0x06,0x2a,0xe8,0x9d,0x84,0xba,0x08,0xe8,0xa1,0x25,0x1a,0x4a,0x22,0x05,0x2a, - 0x26,0x2a,0x21,0x0a,0x18,0xc6,0xb9,0x20,0x0c,0x0e,0x0e,0x6a,0xa7,0x77,0x99,0x5a, - 0x94,0xe7,0x31,0x85,0xea,0xb4,0xa8,0x71,0x04,0xd2,0x39,0xa1,0x6f,0xa5,0x9e,0xc4, - 0x9f,0x6d,0xec,0xb9,0x84,0x1f,0x19,0xad,0xa2,0x8a,0xde,0x19,0xab,0xa2,0x44,0xde, - 0x1b,0xb5,0x82,0x0a,0x5d,0x1e,0xdc,0xe1,0x8a,0x9c,0x2c,0xb9,0xf2,0xca,0x5b,0x1f, - 0xbf,0x86,0xd4,0x2b,0x21,0xc5,0xfe,0x74,0xfe,0x9b,0x23,0xc7,0x56,0x94,0xac,0x62, - 0xc1,0x72,0xf4,0xac,0xb3,0xb4,0x41,0x8b,0x1b,0x26,0xd1,0x42,0x54,0xed,0x39,0xd3, - 0x72,0xaa,0xda,0x29,0xdb,0x32,0x9b,0x5a,0x2a,0xdd,0x72,0x5b,0x1a,0x2c,0xe3,0x62, - 0x5b,0xae,0x5d,0xa4,0x91,0xfb,0x59,0x5c,0xeb,0x82,0xdb,0x6e,0x2f,0xef,0xa2,0x1b, - 0xaf,0xbb,0xf5,0x12,0x05,0x1a,0x31,0xf3,0x26,0x94,0xef,0x59,0xf7,0x26,0xb5,0x19, - 0x33,0xff,0x0e,0x34,0xb0,0x2f,0x05,0xf7,0x13,0x70,0x33,0x09,0xf3,0xbb,0xf0,0x32, - 0x07,0xcb,0xd3,0xb0,0xc0,0x9a,0xe1,0x5b,0x59,0x57,0x96,0x51,0x1c,0x99,0xc5,0x15, - 0x33,0x9c,0xf1,0x37,0x17,0x03,0xbc,0xb1,0xc6,0x1d,0xfb,0xf3,0x31,0x38,0x25,0x23, - 0x1c,0xb2,0xc7,0x29,0x3b,0x35,0x32,0x56,0x2d,0xb3,0x0c,0x19,0x3b,0x2b,0xdf,0x33, - 0xb3,0xc8,0x8b,0x81,0x7c,0x73,0x3c,0x2f,0x43,0xbc,0xb3,0xc9,0x3d,0x4f,0xf5,0xb3, - 0xcd,0x87,0x91,0x1c,0x33,0xcd,0x45,0xc3,0x9c,0x33,0xcf,0x8c,0x11,0xbd,0xb4,0xd1, - 0x4d,0x23,0x6d,0x18,0xd3,0x43,0xa3,0x9c,0xb4,0xd3,0x53,0x43,0x2d,0x98,0xd4,0x51, - 0x53,0x7d,0xb5,0xd5,0x5b,0x63,0xdd,0x17,0xce,0x59,0x73,0x3d,0xb6,0xd6,0x81,0x91, - 0x5d,0x36,0xda,0x67,0x7b,0x9d,0x36,0xd8,0x61,0xb3,0xbd,0xb6,0xd9,0x71,0xeb,0x5c, - 0xb5,0xdc,0x7c,0xb9,0x8d,0x17,0xc6,0x6d,0x03,0xdd,0xb5,0xdd,0x79,0xc3,0x7d,0x37, - 0xc7,0x5f,0xd3,0xdd,0xb7,0xda,0x81,0x2b,0x3d,0xb8,0xdf,0x77,0xe1,0xbd,0xb8,0xe0, - 0x7b,0x9b,0xf3,0x34,0xc1,0x75,0xf3,0xfe,0x9d,0xb8,0xe1,0x7f,0x23,0xfe,0x38,0xe0, - 0x97,0x13,0x5e,0x39,0xe3,0x73,0x79,0x2e,0x97,0xde,0x73,0xcb,0x3c,0x39,0xe8,0x6e, - 0x99,0xde,0x96,0xe8,0x6f,0x63,0x3e,0xba,0xe5,0x8d,0xb3,0xbe,0xba,0xe4,0x85,0x43, - 0x5e,0xba,0xe6,0xaf,0x73,0x9e,0x39,0xec,0x87,0xe3,0x9e,0x3b,0xe5,0x9d,0xbb,0x5c, - 0x3b,0xe9,0xc1,0xab,0x3c,0x3c,0xed,0xc5,0x67,0x73,0xb4,0xeb,0xb7,0xf3,0x1e,0x3b, - 0xea,0x69,0x29,0xfe,0x39,0xf4,0xd1,0x3b,0xff,0xbc,0xf2,0xd3,0xdb,0xbe,0x3c,0xf3, - 0xcd,0x6b,0xbf,0xbb,0xee,0xdd,0x73,0xff,0xbd,0xf1,0xc7,0x0b,0xdd,0x3b,0xf9,0xad, - 0x0b,0x3f,0xfe,0x34,0x41,0x03,0x9f,0xbe,0x58,0xc9,0x7b,0xbf,0xbd,0xcf,0xef,0xc3, - 0xbf,0xb9,0xf8,0xb3,0x83,0x1f,0x3e,0xf2,0xeb,0xdb,0x7f,0x3f,0x35,0x35,0xe3,0x5f, - 0x3f,0xe2,0x45,0x8e,0x7a,0xa7,0x63,0xdf,0x00,0xb1,0x97,0x3f,0xf7,0xed,0x8f,0x7f, - 0xfd,0x73,0xd8,0xff,0xe8,0x97,0x40,0x07,0x2e,0x90,0x81,0x0d,0xd4,0xd7,0xc9,0xa4, - 0x17,0x41,0x0b,0x3e,0x10,0x80,0xf1,0xf3,0xd7,0x05,0xad,0xd7,0x41,0x0d,0x6e,0x90, - 0x83,0x19,0xbc,0x45,0xc4,0x64,0xf7,0x41,0x83,0x9d,0x10,0x83,0x21,0x34,0xe1,0x0a, - 0x41,0x78,0x3e,0x17,0xbe,0x90,0x80,0x01,0xb4,0xc5,0xbe,0x1c,0x37,0x42,0x54,0xf4, - 0x8b,0x5e,0x33,0xd4,0xe1,0x0e,0x1f,0x92,0x2e,0x1b,0xde,0x10,0x87,0x13,0x53,0xd7, - 0x0f,0x81,0x18,0x44,0x1f,0x0e,0x51,0x75,0x45,0xf4,0x56,0xb8,0x90,0xf5,0x44,0x50, - 0x7c,0x8b,0x87,0x49,0x54,0xc5,0xfe,0x14,0xa9,0xb8,0xc4,0x46,0x64,0x0b,0x8a,0xe7, - 0x92,0x56,0x17,0xd9,0xf5,0xc5,0xc7,0x6c,0x11,0x8c,0x61,0xa4,0xcc,0xb5,0xc8,0x18, - 0x45,0x63,0x35,0x0b,0x58,0x57,0xf4,0xd5,0x1a,0x89,0x35,0x2c,0xcf,0x30,0x07,0x56, - 0x73,0x94,0x03,0x75,0xf4,0xb4,0xab,0x34,0xdc,0x8a,0x8d,0xcb,0x72,0xd5,0x1e,0xf9, - 0xd8,0x47,0x2d,0xcc,0x0a,0x8f,0x83,0xcc,0x42,0xaa,0x08,0xf9,0x2a,0x53,0x1d,0x92, - 0x56,0xa1,0x02,0x46,0x23,0xe1,0x88,0x28,0x20,0x74,0x0a,0x89,0x93,0x94,0xd4,0xa6, - 0xe0,0xf5,0x1f,0xeb,0x1c,0x88,0x52,0x97,0xea,0x48,0x27,0x31,0xe5,0x21,0x0b,0x9c, - 0x08,0x52,0x8a,0x1a,0x15,0x27,0x4b,0x99,0xc8,0x9c,0xa0,0xf2,0x54,0x8c,0x5a,0x65, - 0xac,0xd0,0xe4,0xca,0x3f,0x82,0x32,0x96,0x75,0x84,0x25,0x2d,0x03,0x39,0xcb,0x5b, - 0xb6,0xf1,0x94,0xba,0xdc,0x25,0x2f,0x7b,0x99,0x45,0x52,0x02,0x33,0x98,0xbf,0x1c, - 0x66,0x0f,0x8b,0x69,0xcc,0x09,0xaa,0x32,0x99,0x0f,0xeb,0x13,0x33,0x73,0x28,0xcc, - 0x67,0xb6,0x6f,0x99,0xd2,0x9c,0x1f,0x97,0xaa,0x39,0xcd,0x5c,0x62,0xb3,0x84,0x57, - 0xd9,0x66,0xf9,0xca,0xe4,0xcd,0x16,0x9a,0x25,0x9c,0xe2,0x1c,0x27,0x39,0xaf,0x37, - 0xa5,0x73,0x86,0x4e,0x34,0xea,0x4c,0x1d,0x91,0xda,0x89,0x96,0xd8,0xc0,0x73,0x2c, - 0x3e,0x9a,0xa7,0x57,0x82,0x64,0xcf,0xaa,0xf4,0x26,0x9f,0xfa,0xc4,0x27,0x3f,0x9f, - 0x82,0xa3,0x7f,0x2a,0x65,0x47,0x02,0x35,0x4a,0x8d,0x0a,0x0a,0x94,0xe6,0x20,0x34, - 0xa1,0x0a,0x5d,0xa8,0x4d,0xfe,0x5e,0xe4,0xd0,0x98,0x98,0x28,0xa2,0x2a,0x61,0x11, - 0x45,0x49,0x12,0x9e,0x8b,0x7e,0xa4,0x3c,0x1a,0xf5,0x48,0x7a,0x3a,0x3a,0x91,0x11, - 0x81,0x94,0x21,0x20,0x1a,0xa9,0x41,0x34,0x64,0xd2,0x80,0xe4,0x27,0xa5,0xfb,0xb8, - 0x10,0x4b,0xe9,0x11,0xa0,0x97,0xbe,0xa3,0x40,0x32,0x75,0x47,0x83,0x6a,0x2a,0x0e, - 0x08,0xe1,0x34,0xa7,0x3a,0xdd,0xa9,0x35,0x20,0x64,0x00,0x9f,0xfe,0x14,0xa8,0x11, - 0x12,0xaa,0x30,0x88,0x1a,0x54,0xa3,0x1e,0x15,0xa9,0x45,0x55,0xea,0x2c,0x98,0x9a, - 0x54,0xa7,0x3e,0x15,0xaa,0x4d,0x95,0x2a,0x4b,0xa8,0x5a,0x55,0xab,0xe2,0x04,0xab, - 0x5a,0xbd,0x2a,0x56,0xa3,0xda,0xd5,0xa3,0x7c,0xf5,0x00,0x61,0x15,0xca,0x58,0xc1, - 0x5a,0xd6,0x40,0x9c,0x55,0x41,0x69,0xb5,0xca,0x5a,0xc9,0xda,0xd6,0xad,0xbc,0x15, - 0xae,0x71,0x2d,0xcb,0x5c,0xd1,0x5a,0x57,0xba,0xdc,0x95,0xae,0x79,0x5d,0xc3,0x5e, - 0xd9,0xda,0x57,0xbf,0xfc,0x15,0xb0,0x81,0x45,0xcc,0x60,0x09,0x5b,0xd8,0xc6,0x1c, - 0x96,0xaf,0x89,0x2d,0xc2,0x62,0x13,0xd0,0x58,0x41,0x3c,0x16,0xb1,0x91,0x0d,0xc1, - 0x64,0xab,0x51,0x59,0xce,0x5c,0x96,0xb2,0x99,0xbd,0xc2,0x66,0x39,0x5b,0xd9,0xcf, - 0x62,0xb6,0xb3,0x1e,0x10,0xed,0x68,0x49,0x6b,0x5a,0x03,0xa1,0x36,0xb5,0xa7,0x0d, - 0x2d,0x6b,0x5b,0x9b,0xd8,0xd7,0xaa,0xd6,0xb5,0xb2,0x85,0x6c,0x64,0x6b,0xfb,0x92, - 0xd8,0xe2,0x76,0xb6,0x81,0xdd,0x6d,0x6e,0xfb,0xea,0xdb,0xdf,0xe6,0x35,0xb8,0xc2, - 0x6d,0x2b,0x71,0x05,0xfe,0x14,0xd7,0xe3,0x22,0xd7,0xb8,0xca,0x2d,0xae,0x56,0x9b, - 0xeb,0x80,0xb2,0x42,0x37,0xba,0x61,0x9d,0x2e,0x75,0xad,0x6a,0xdd,0xeb,0x4a,0x35, - 0xbb,0xda,0x35,0x2a,0x77,0xfd,0xa3,0xd4,0xef,0x82,0xd7,0xbb,0xe2,0xed,0x6e,0x4d, - 0xcb,0xbb,0x81,0x9d,0xa2,0x37,0xbd,0x38,0x5d,0x2f,0x7b,0x5f,0xea,0x5e,0x51,0xc0, - 0x37,0xbe,0xef,0x35,0x29,0x7d,0xe5,0x6b,0xdf,0xfb,0xe2,0xb7,0xa3,0xfa,0xd5,0xcf, - 0x48,0xfb,0xeb,0x5f,0x8d,0x02,0x38,0x25,0x17,0x1d,0x30,0x81,0x29,0x6a,0xe0,0x03, - 0x2f,0x34,0xc1,0x8e,0x5a,0x30,0x83,0x1b,0x2c,0xd0,0x07,0xdb,0xa7,0xa0,0x12,0x9e, - 0x30,0x3f,0x2b,0x2c,0xca,0x7c,0x62,0x38,0xc3,0xf6,0xdc,0x30,0x87,0xdb,0xe9,0x61, - 0xf9,0x80,0x38,0xc4,0x1f,0x26,0x27,0x89,0x45,0x6c,0xe2,0x13,0xa3,0x78,0x9b,0x2a, - 0x1e,0x09,0x36,0x5b,0xec,0xe2,0x6a,0xc2,0x38,0xc6,0xcc,0x9c,0xb1,0x7b,0x9e,0x69, - 0xe3,0x1b,0xd7,0x38,0xc7,0x34,0xee,0x25,0x8f,0x47,0x60,0xcc,0x1f,0x93,0x00,0x98, - 0x42,0x1e,0xb2,0x8f,0x8b,0x0c,0xe4,0x5b,0x22,0x59,0x3d,0xb1,0x5c,0xb2,0x09,0x5c, - 0xe9,0xe4,0x27,0xaf,0x32,0xca,0x52,0x56,0x14,0x95,0xcd,0x73,0xa8,0x2b,0x5b,0xd2, - 0x4f,0x5a,0xde,0xf2,0x9e,0xba,0xec,0x65,0x39,0x81,0xd9,0x93,0x6f,0x1a,0xb3,0x78, - 0xca,0x6c,0x66,0x32,0x9b,0x29,0xcd,0x67,0x5e,0x33,0x9b,0xdb,0xdc,0xa5,0x37,0x5f, - 0x44,0x4b,0x72,0x9e,0xf3,0x95,0xea,0x6c,0x67,0x27,0xe1,0x59,0x0a,0x51,0xda,0xb3, - 0xa7,0x90,0xe4,0xfe,0xe7,0x3f,0x17,0x29,0xd0,0x82,0xe6,0x11,0xa1,0xb5,0x63,0xe8, - 0x43,0x23,0x7a,0x46,0x8a,0x8e,0x81,0x8d,0x1a,0xed,0x68,0x46,0x43,0xda,0x52,0x2d, - 0x9a,0xb4,0x26,0x1b,0x65,0xe9,0x4b,0x6f,0x28,0xd3,0x11,0xd9,0x34,0xa7,0x75,0x10, - 0xca,0x4f,0x83,0xba,0x42,0xa2,0x96,0xce,0x27,0x4b,0x3d,0xea,0x01,0xa1,0xda,0x39, - 0x99,0x5c,0x75,0x0f,0x54,0xed,0xea,0x57,0x57,0x32,0xd6,0x58,0x7e,0x24,0xad,0x29, - 0xcd,0xca,0x5b,0xa7,0xba,0x90,0xba,0x36,0x75,0x2a,0x7b,0xdd,0xe9,0x57,0x02,0xfb, - 0x07,0xc2,0x1e,0x36,0xb1,0xef,0x68,0x6c,0x47,0xe2,0x32,0xd9,0xbe,0x1e,0x23,0xb3, - 0x25,0xf9,0xc6,0x67,0x2b,0xc7,0xd9,0xd2,0x86,0x76,0x1a,0xab,0x2d,0xaa,0x23,0x62, - 0x3b,0xdb,0x4d,0xdc,0xb6,0x70,0x8e,0xe9,0x6d,0x56,0x77,0x3b,0xdc,0x4b,0x18,0x37, - 0xb9,0xcb,0xad,0xcc,0x73,0xcb,0x3a,0x9b,0xea,0x0e,0xf6,0x37,0xdb,0x3d,0xed,0x18, - 0xc2,0xfb,0xdb,0xdc,0x9c,0x77,0xbc,0x6b,0x68,0xef,0x26,0xd4,0x3b,0xdf,0xf7,0x76, - 0x27,0xbf,0x05,0x59,0xc0,0x7f,0xab,0x8a,0x2c,0x02,0xf7,0x42,0x3c,0x0b,0x6e,0xf0, - 0xaf,0x20,0x3c,0x1f,0x5a,0x59,0x38,0xc3,0xb3,0xe2,0xf0,0x87,0x43,0x25,0xe2,0xad, - 0x99,0x38,0xc5,0x2b,0x3e,0xd0,0x8b,0xcb,0xca,0xa0,0x1a,0x47,0x4d,0x50,0x3a,0x6e, - 0x2b,0x9e,0x80,0x7c,0x34,0x37,0x19,0x79,0x1c,0x1e,0x6a,0x72,0x92,0xc3,0x24,0xe5, - 0x27,0x5f,0x09,0xcb,0xed,0x58,0x92,0x97,0xcb,0x31,0x23,0x32,0xd7,0x15,0xcd,0x6b, - 0x6e,0x73,0xac,0x89,0xe0,0x7c,0x0f,0x3a,0xdf,0x39,0xcf,0x0f,0xe2,0x73,0x61,0xa9, - 0x34,0xe8,0x42,0xd7,0x07,0xd1,0xd5,0x08,0xd3,0xa3,0x9b,0x71,0xa6,0x4a,0x5f,0x3a, - 0x3a,0x9a,0x5e,0x08,0x9b,0x42,0x3d,0xea,0xe3,0x98,0x3a,0x23,0x78,0x6a,0x75,0x31, - 0x42,0x23,0xeb,0xca,0xda,0x3a,0xd7,0xbb,0x8e,0x8c,0xaf,0x57,0x22,0xec,0x62,0x1f, - 0xfb,0x2e,0xca,0x6e,0xc5,0xa9,0xa2,0xbd,0x30,0x14,0x59,0xbb,0x17,0x4d,0xe2,0x76, - 0x6d,0xc1,0x3d,0xee,0x72,0x37,0x2b,0xdd,0xeb,0x1e,0x89,0xbb,0x3b,0x31,0xef,0x7a, - 0xdf,0xbb,0x5b,0xfb,0xbe,0x97,0xa8,0x00,0x3e,0xf0,0x6a,0x1d,0xbc,0x12,0xed,0x6a, - 0x78,0xbf,0xb7,0x21,0xf1,0xe6,0x52,0x0b,0xe3,0x1b,0xef,0xd7,0xc7,0x1b,0x31,0x2f, - 0x92,0x87,0xfc,0x60,0x2a,0x2f,0x44,0x2a,0x60,0x5e,0x5e,0x86,0xdd,0xbc,0xbd,0x1c, - 0xeb,0x79,0x15,0x4a,0x26,0xf4,0xa2,0xd7,0x2c,0xe9,0x4b,0x1f,0x9a,0xd3,0x8b,0xb0, - 0xb4,0xaa,0xdf,0x86,0x69,0x5a,0xef,0x7a,0xcf,0xc2,0xde,0xf5,0x09,0x2e,0x00,0x00, + 0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0x00, 0x02, 0x00, 0x02, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x21, 0xfe, 0x11, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69, + 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x00, 0x21, 0xf9, 0x04, 0x01, 0x0a, 0x00, 0x01, 0x00, + 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0xfe, 0x8c, 0x8f, 0xa9, 0xcb, + 0xed, 0x0f, 0xa3, 0x9c, 0xb4, 0xda, 0x8b, 0x33, 0x04, 0xbc, 0xfb, 0x0f, 0x7e, 0xda, 0x48, 0x96, + 0xe6, 0x89, 0xa6, 0xea, 0xca, 0xb6, 0xee, 0x0b, 0xc7, 0x48, 0x48, 0xd7, 0xf6, 0xcd, 0xc9, 0xfa, + 0xce, 0xf7, 0xfe, 0x0f, 0x0c, 0x0a, 0x59, 0xb8, 0xa2, 0xf1, 0x48, 0x1b, 0x2a, 0x97, 0xcc, 0xa6, + 0xf3, 0x09, 0x6d, 0x21, 0xa7, 0xd4, 0x6a, 0x2e, 0x8a, 0xcd, 0x6a, 0xb7, 0xdc, 0x6e, 0xc6, 0x0a, + 0x0e, 0x5b, 0xbd, 0xe4, 0xb2, 0xf9, 0x8c, 0x5e, 0x89, 0xd7, 0xec, 0x71, 0xfa, 0x0d, 0x8f, 0xcb, + 0xb7, 0xed, 0xba, 0xbd, 0x3a, 0xcf, 0xeb, 0xf7, 0xfc, 0xd4, 0xfd, 0x0f, 0x88, 0xd4, 0x37, 0x48, + 0x58, 0x38, 0x18, 0x88, 0x98, 0x78, 0x64, 0xc8, 0xd8, 0xe8, 0x88, 0xa5, 0x18, 0x29, 0x89, 0xf3, + 0x58, 0x69, 0x79, 0xf9, 0x32, 0xa9, 0xb9, 0x59, 0x83, 0xe9, 0xf9, 0x09, 0x1a, 0xc1, 0x39, 0x4a, + 0x0a, 0x12, 0x7a, 0x8a, 0x7a, 0x59, 0xba, 0xca, 0x0a, 0x90, 0xfa, 0x0a, 0xab, 0xd7, 0x3a, 0xdb, + 0x1a, 0x6b, 0x7b, 0xdb, 0x45, 0xab, 0x5b, 0x8b, 0xdb, 0xeb, 0x2b, 0xb4, 0x1b, 0x4c, 0xfb, 0x4b, + 0x5c, 0xec, 0x22, 0x8c, 0x3c, 0x6c, 0xbc, 0xcc, 0x8c, 0x91, 0xfc, 0xac, 0xdc, 0x2c, 0x3d, 0xad, + 0x00, 0x6d, 0x1d, 0x4d, 0x9d, 0x6d, 0x7c, 0xcd, 0x8d, 0xad, 0xfd, 0x1d, 0xdb, 0x2d, 0xee, 0x0d, + 0x5e, 0xee, 0x39, 0x8e, 0x4e, 0x6e, 0xbe, 0x6e, 0x98, 0xee, 0xae, 0xce, 0x1e, 0x3f, 0xf7, 0x4e, + 0x0f, 0x2f, 0x7f, 0x5f, 0x56, 0xaf, 0x6f, 0x8f, 0xdf, 0x1f, 0xb5, 0x0f, 0x90, 0x9f, 0xbf, 0x81, + 0x43, 0x02, 0x1a, 0xe4, 0x45, 0x30, 0xa1, 0x92, 0x83, 0x0c, 0x11, 0x2a, 0x7c, 0xb8, 0xa3, 0xa1, + 0x44, 0x87, 0x10, 0x2b, 0x12, 0x99, 0x88, 0xb1, 0x94, 0xc5, 0xfe, 0x8d, 0x7e, 0x32, 0x7a, 0xd4, + 0xc8, 0x31, 0xe4, 0x97, 0x8f, 0x24, 0x47, 0x89, 0x3c, 0x39, 0xa1, 0xa4, 0x4a, 0x52, 0x28, 0x5b, + 0x32, 0x58, 0x09, 0x93, 0x93, 0xcb, 0x99, 0x01, 0x62, 0xda, 0x94, 0x49, 0x53, 0xe4, 0xcd, 0x9d, + 0x9a, 0x72, 0x6e, 0xe4, 0x09, 0xb4, 0xa7, 0x4f, 0x85, 0x41, 0x8b, 0x4a, 0x1a, 0x4a, 0xd0, 0xa8, + 0x52, 0x45, 0x48, 0xf1, 0x2d, 0x7d, 0xca, 0xb4, 0xe9, 0x3a, 0xa8, 0x54, 0x11, 0x49, 0x2d, 0x57, + 0x35, 0x2b, 0xa0, 0xab, 0xda, 0xb4, 0x7a, 0xbd, 0xc3, 0x55, 0xda, 0xd7, 0xb1, 0x60, 0xc3, 0x16, + 0x23, 0x8b, 0xb6, 0x8e, 0xd9, 0x5f, 0x69, 0xdb, 0xb2, 0x59, 0x8b, 0xcb, 0xad, 0x5c, 0x31, 0x70, + 0xc3, 0xcd, 0xbd, 0xeb, 0xa6, 0x6e, 0x28, 0xbc, 0x7c, 0xc1, 0xe8, 0xfd, 0xd4, 0x37, 0x30, 0x9e, + 0xbf, 0x96, 0x04, 0x1b, 0x9e, 0x42, 0xf8, 0xd1, 0xe1, 0xc5, 0x8b, 0x12, 0xb7, 0x63, 0x0c, 0x99, + 0x92, 0xe3, 0x43, 0x91, 0x2b, 0xdb, 0x98, 0xcc, 0xc7, 0xb2, 0xe6, 0x4e, 0x98, 0xe7, 0x6d, 0xfe, + 0x6c, 0xaa, 0x33, 0x1c, 0xd0, 0xa4, 0x45, 0x88, 0x46, 0x53, 0x3a, 0x75, 0x87, 0xd3, 0x66, 0x54, + 0xbb, 0x76, 0xc5, 0x3a, 0xd7, 0x6b, 0xd7, 0xb1, 0xe9, 0xcc, 0x7e, 0x5d, 0x1b, 0xd2, 0xed, 0xd9, + 0xb9, 0x9f, 0xec, 0xde, 0xdd, 0x9b, 0xc9, 0xef, 0xdf, 0xc1, 0x0b, 0x0e, 0x07, 0x5e, 0x3c, 0xc8, + 0x71, 0xe2, 0xc9, 0x7d, 0x2c, 0x1f, 0xde, 0x9c, 0xc7, 0xf3, 0xe3, 0xd1, 0x65, 0x4c, 0x5f, 0x5e, + 0x3d, 0xd3, 0x75, 0xec, 0xd9, 0xd5, 0x6c, 0x7f, 0xde, 0x5d, 0xc5, 0x77, 0xf0, 0xe1, 0x4f, 0x8c, + 0x9f, 0x5e, 0xbe, 0xc4, 0xf9, 0xeb, 0xe9, 0x35, 0xac, 0xdf, 0xde, 0xfe, 0xc2, 0xfb, 0xef, 0xf1, + 0x2b, 0xcc, 0x87, 0x5f, 0x5f, 0xc2, 0x7d, 0xfa, 0xf9, 0xfe, 0x1f, 0xec, 0x1f, 0xdf, 0x5f, 0x03, + 0xff, 0x9d, 0x17, 0xe0, 0x02, 0x03, 0x02, 0x58, 0xe0, 0x0c, 0x07, 0x22, 0x98, 0xe0, 0x82, 0xeb, + 0x25, 0x58, 0x93, 0x83, 0x0c, 0xf6, 0x27, 0xe1, 0x83, 0x14, 0x56, 0x68, 0x61, 0x7d, 0x18, 0x66, + 0xd8, 0xde, 0x86, 0xef, 0xc5, 0xe7, 0xe1, 0x7c, 0x1d, 0x86, 0xc8, 0x61, 0x76, 0x24, 0x8a, 0xd8, + 0xdd, 0x89, 0xf7, 0xa5, 0xa8, 0xe2, 0x87, 0xd5, 0xb5, 0xb8, 0x62, 0x74, 0x30, 0xa2, 0x98, 0xdc, + 0x8c, 0x31, 0x06, 0x67, 0xe3, 0x7e, 0xc5, 0xe5, 0x78, 0x63, 0x6d, 0x3c, 0xea, 0x98, 0xdb, 0x8f, + 0x3d, 0x9e, 0x26, 0x24, 0x90, 0xac, 0x15, 0x39, 0x24, 0x66, 0x48, 0x1a, 0xd9, 0xd9, 0x92, 0x49, + 0x26, 0xe6, 0x24, 0x93, 0x8e, 0x45, 0xf9, 0xa4, 0x5e, 0x54, 0x4a, 0xf9, 0xd7, 0x95, 0x55, 0xae, + 0xa5, 0x25, 0x96, 0x70, 0x75, 0xb9, 0x25, 0x57, 0x60, 0x7a, 0x19, 0xd6, 0x98, 0x61, 0x36, 0x65, + 0x26, 0x99, 0x52, 0xa5, 0x79, 0xa6, 0x4f, 0x6c, 0xaa, 0x39, 0xd4, 0x9b, 0x6d, 0xce, 0x24, 0x27, + 0x9c, 0x34, 0xd5, 0x39, 0x67, 0x4b, 0x78, 0xd2, 0xb8, 0xe6, 0x9e, 0x7c, 0x22, 0xe5, 0xe7, 0x9f, + 0x6e, 0x06, 0x2a, 0xe8, 0x9d, 0x84, 0xba, 0x08, 0xe8, 0xa1, 0x25, 0x1a, 0x4a, 0x22, 0x05, 0x2a, + 0x26, 0x2a, 0x21, 0x0a, 0x18, 0xc6, 0xb9, 0x20, 0x0c, 0x0e, 0x0e, 0x6a, 0xa7, 0x77, 0x99, 0x5a, + 0x94, 0xe7, 0x31, 0x85, 0xea, 0xb4, 0xa8, 0x71, 0x04, 0xd2, 0x39, 0xa1, 0x6f, 0xa5, 0x9e, 0xc4, + 0x9f, 0x6d, 0xec, 0xb9, 0x84, 0x1f, 0x19, 0xad, 0xa2, 0x8a, 0xde, 0x19, 0xab, 0xa2, 0x44, 0xde, + 0x1b, 0xb5, 0x82, 0x0a, 0x5d, 0x1e, 0xdc, 0xe1, 0x8a, 0x9c, 0x2c, 0xb9, 0xf2, 0xca, 0x5b, 0x1f, + 0xbf, 0x86, 0xd4, 0x2b, 0x21, 0xc5, 0xfe, 0x74, 0xfe, 0x9b, 0x23, 0xc7, 0x56, 0x94, 0xac, 0x62, + 0xc1, 0x72, 0xf4, 0xac, 0xb3, 0xb4, 0x41, 0x8b, 0x1b, 0x26, 0xd1, 0x42, 0x54, 0xed, 0x39, 0xd3, + 0x72, 0xaa, 0xda, 0x29, 0xdb, 0x32, 0x9b, 0x5a, 0x2a, 0xdd, 0x72, 0x5b, 0x1a, 0x2c, 0xe3, 0x62, + 0x5b, 0xae, 0x5d, 0xa4, 0x91, 0xfb, 0x59, 0x5c, 0xeb, 0x82, 0xdb, 0x6e, 0x2f, 0xef, 0xa2, 0x1b, + 0xaf, 0xbb, 0xf5, 0x12, 0x05, 0x1a, 0x31, 0xf3, 0x26, 0x94, 0xef, 0x59, 0xf7, 0x26, 0xb5, 0x19, + 0x33, 0xff, 0x0e, 0x34, 0xb0, 0x2f, 0x05, 0xf7, 0x13, 0x70, 0x33, 0x09, 0xf3, 0xbb, 0xf0, 0x32, + 0x07, 0xcb, 0xd3, 0xb0, 0xc0, 0x9a, 0xe1, 0x5b, 0x59, 0x57, 0x96, 0x51, 0x1c, 0x99, 0xc5, 0x15, + 0x33, 0x9c, 0xf1, 0x37, 0x17, 0x03, 0xbc, 0xb1, 0xc6, 0x1d, 0xfb, 0xf3, 0x31, 0x38, 0x25, 0x23, + 0x1c, 0xb2, 0xc7, 0x29, 0x3b, 0x35, 0x32, 0x56, 0x2d, 0xb3, 0x0c, 0x19, 0x3b, 0x2b, 0xdf, 0x33, + 0xb3, 0xc8, 0x8b, 0x81, 0x7c, 0x73, 0x3c, 0x2f, 0x43, 0xbc, 0xb3, 0xc9, 0x3d, 0x4f, 0xf5, 0xb3, + 0xcd, 0x87, 0x91, 0x1c, 0x33, 0xcd, 0x45, 0xc3, 0x9c, 0x33, 0xcf, 0x8c, 0x11, 0xbd, 0xb4, 0xd1, + 0x4d, 0x23, 0x6d, 0x18, 0xd3, 0x43, 0xa3, 0x9c, 0xb4, 0xd3, 0x53, 0x43, 0x2d, 0x98, 0xd4, 0x51, + 0x53, 0x7d, 0xb5, 0xd5, 0x5b, 0x63, 0xdd, 0x17, 0xce, 0x59, 0x73, 0x3d, 0xb6, 0xd6, 0x81, 0x91, + 0x5d, 0x36, 0xda, 0x67, 0x7b, 0x9d, 0x36, 0xd8, 0x61, 0xb3, 0xbd, 0xb6, 0xd9, 0x71, 0xeb, 0x5c, + 0xb5, 0xdc, 0x7c, 0xb9, 0x8d, 0x17, 0xc6, 0x6d, 0x03, 0xdd, 0xb5, 0xdd, 0x79, 0xc3, 0x7d, 0x37, + 0xc7, 0x5f, 0xd3, 0xdd, 0xb7, 0xda, 0x81, 0x2b, 0x3d, 0xb8, 0xdf, 0x77, 0xe1, 0xbd, 0xb8, 0xe0, + 0x7b, 0x9b, 0xf3, 0x34, 0xc1, 0x75, 0xf3, 0xfe, 0x9d, 0xb8, 0xe1, 0x7f, 0x23, 0xfe, 0x38, 0xe0, + 0x97, 0x13, 0x5e, 0x39, 0xe3, 0x73, 0x79, 0x2e, 0x97, 0xde, 0x73, 0xcb, 0x3c, 0x39, 0xe8, 0x6e, + 0x99, 0xde, 0x96, 0xe8, 0x6f, 0x63, 0x3e, 0xba, 0xe5, 0x8d, 0xb3, 0xbe, 0xba, 0xe4, 0x85, 0x43, + 0x5e, 0xba, 0xe6, 0xaf, 0x73, 0x9e, 0x39, 0xec, 0x87, 0xe3, 0x9e, 0x3b, 0xe5, 0x9d, 0xbb, 0x5c, + 0x3b, 0xe9, 0xc1, 0xab, 0x3c, 0x3c, 0xed, 0xc5, 0x67, 0x73, 0xb4, 0xeb, 0xb7, 0xf3, 0x1e, 0x3b, + 0xea, 0x69, 0x29, 0xfe, 0x39, 0xf4, 0xd1, 0x3b, 0xff, 0xbc, 0xf2, 0xd3, 0xdb, 0xbe, 0x3c, 0xf3, + 0xcd, 0x6b, 0xbf, 0xbb, 0xee, 0xdd, 0x73, 0xff, 0xbd, 0xf1, 0xc7, 0x0b, 0xdd, 0x3b, 0xf9, 0xad, + 0x0b, 0x3f, 0xfe, 0x34, 0x41, 0x03, 0x9f, 0xbe, 0x58, 0xc9, 0x7b, 0xbf, 0xbd, 0xcf, 0xef, 0xc3, + 0xbf, 0xb9, 0xf8, 0xb3, 0x83, 0x1f, 0x3e, 0xf2, 0xeb, 0xdb, 0x7f, 0x3f, 0x35, 0x35, 0xe3, 0x5f, + 0x3f, 0xe2, 0x45, 0x8e, 0x7a, 0xa7, 0x63, 0xdf, 0x00, 0xb1, 0x97, 0x3f, 0xf7, 0xed, 0x8f, 0x7f, + 0xfd, 0x73, 0xd8, 0xff, 0xe8, 0x97, 0x40, 0x07, 0x2e, 0x90, 0x81, 0x0d, 0xd4, 0xd7, 0xc9, 0xa4, + 0x17, 0x41, 0x0b, 0x3e, 0x10, 0x80, 0xf1, 0xf3, 0xd7, 0x05, 0xad, 0xd7, 0x41, 0x0d, 0x6e, 0x90, + 0x83, 0x19, 0xbc, 0x45, 0xc4, 0x64, 0xf7, 0x41, 0x83, 0x9d, 0x10, 0x83, 0x21, 0x34, 0xe1, 0x0a, + 0x41, 0x78, 0x3e, 0x17, 0xbe, 0x90, 0x80, 0x01, 0xb4, 0xc5, 0xbe, 0x1c, 0x37, 0x42, 0x54, 0xf4, + 0x8b, 0x5e, 0x33, 0xd4, 0xe1, 0x0e, 0x1f, 0x92, 0x2e, 0x1b, 0xde, 0x10, 0x87, 0x13, 0x53, 0xd7, + 0x0f, 0x81, 0x18, 0x44, 0x1f, 0x0e, 0x51, 0x75, 0x45, 0xf4, 0x56, 0xb8, 0x90, 0xf5, 0x44, 0x50, + 0x7c, 0x8b, 0x87, 0x49, 0x54, 0xc5, 0xfe, 0x14, 0xa9, 0xb8, 0xc4, 0x46, 0x64, 0x0b, 0x8a, 0xe7, + 0x92, 0x56, 0x17, 0xd9, 0xf5, 0xc5, 0xc7, 0x6c, 0x11, 0x8c, 0x61, 0xa4, 0xcc, 0xb5, 0xc8, 0x18, + 0x45, 0x63, 0x35, 0x0b, 0x58, 0x57, 0xf4, 0xd5, 0x1a, 0x89, 0x35, 0x2c, 0xcf, 0x30, 0x07, 0x56, + 0x73, 0x94, 0x03, 0x75, 0xf4, 0xb4, 0xab, 0x34, 0xdc, 0x8a, 0x8d, 0xcb, 0x72, 0xd5, 0x1e, 0xf9, + 0xd8, 0x47, 0x2d, 0xcc, 0x0a, 0x8f, 0x83, 0xcc, 0x42, 0xaa, 0x08, 0xf9, 0x2a, 0x53, 0x1d, 0x92, + 0x56, 0xa1, 0x02, 0x46, 0x23, 0xe1, 0x88, 0x28, 0x20, 0x74, 0x0a, 0x89, 0x93, 0x94, 0xd4, 0xa6, + 0xe0, 0xf5, 0x1f, 0xeb, 0x1c, 0x88, 0x52, 0x97, 0xea, 0x48, 0x27, 0x31, 0xe5, 0x21, 0x0b, 0x9c, + 0x08, 0x52, 0x8a, 0x1a, 0x15, 0x27, 0x4b, 0x99, 0xc8, 0x9c, 0xa0, 0xf2, 0x54, 0x8c, 0x5a, 0x65, + 0xac, 0xd0, 0xe4, 0xca, 0x3f, 0x82, 0x32, 0x96, 0x75, 0x84, 0x25, 0x2d, 0x03, 0x39, 0xcb, 0x5b, + 0xb6, 0xf1, 0x94, 0xba, 0xdc, 0x25, 0x2f, 0x7b, 0x99, 0x45, 0x52, 0x02, 0x33, 0x98, 0xbf, 0x1c, + 0x66, 0x0f, 0x8b, 0x69, 0xcc, 0x09, 0xaa, 0x32, 0x99, 0x0f, 0xeb, 0x13, 0x33, 0x73, 0x28, 0xcc, + 0x67, 0xb6, 0x6f, 0x99, 0xd2, 0x9c, 0x1f, 0x97, 0xaa, 0x39, 0xcd, 0x5c, 0x62, 0xb3, 0x84, 0x57, + 0xd9, 0x66, 0xf9, 0xca, 0xe4, 0xcd, 0x16, 0x9a, 0x25, 0x9c, 0xe2, 0x1c, 0x27, 0x39, 0xaf, 0x37, + 0xa5, 0x73, 0x86, 0x4e, 0x34, 0xea, 0x4c, 0x1d, 0x91, 0xda, 0x89, 0x96, 0xd8, 0xc0, 0x73, 0x2c, + 0x3e, 0x9a, 0xa7, 0x57, 0x82, 0x64, 0xcf, 0xaa, 0xf4, 0x26, 0x9f, 0xfa, 0xc4, 0x27, 0x3f, 0x9f, + 0x82, 0xa3, 0x7f, 0x2a, 0x65, 0x47, 0x02, 0x35, 0x4a, 0x8d, 0x0a, 0x0a, 0x94, 0xe6, 0x20, 0x34, + 0xa1, 0x0a, 0x5d, 0xa8, 0x4d, 0xfe, 0x5e, 0xe4, 0xd0, 0x98, 0x98, 0x28, 0xa2, 0x2a, 0x61, 0x11, + 0x45, 0x49, 0x12, 0x9e, 0x8b, 0x7e, 0xa4, 0x3c, 0x1a, 0xf5, 0x48, 0x7a, 0x3a, 0x3a, 0x91, 0x11, + 0x81, 0x94, 0x21, 0x20, 0x1a, 0xa9, 0x41, 0x34, 0x64, 0xd2, 0x80, 0xe4, 0x27, 0xa5, 0xfb, 0xb8, + 0x10, 0x4b, 0xe9, 0x11, 0xa0, 0x97, 0xbe, 0xa3, 0x40, 0x32, 0x75, 0x47, 0x83, 0x6a, 0x2a, 0x0e, + 0x08, 0xe1, 0x34, 0xa7, 0x3a, 0xdd, 0xa9, 0x35, 0x20, 0x64, 0x00, 0x9f, 0xfe, 0x14, 0xa8, 0x11, + 0x12, 0xaa, 0x30, 0x88, 0x1a, 0x54, 0xa3, 0x1e, 0x15, 0xa9, 0x45, 0x55, 0xea, 0x2c, 0x98, 0x9a, + 0x54, 0xa7, 0x3e, 0x15, 0xaa, 0x4d, 0x95, 0x2a, 0x4b, 0xa8, 0x5a, 0x55, 0xab, 0xe2, 0x04, 0xab, + 0x5a, 0xbd, 0x2a, 0x56, 0xa3, 0xda, 0xd5, 0xa3, 0x7c, 0xf5, 0x00, 0x61, 0x15, 0xca, 0x58, 0xc1, + 0x5a, 0xd6, 0x40, 0x9c, 0x55, 0x41, 0x69, 0xb5, 0xca, 0x5a, 0xc9, 0xda, 0xd6, 0xad, 0xbc, 0x15, + 0xae, 0x71, 0x2d, 0xcb, 0x5c, 0xd1, 0x5a, 0x57, 0xba, 0xdc, 0x95, 0xae, 0x79, 0x5d, 0xc3, 0x5e, + 0xd9, 0xda, 0x57, 0xbf, 0xfc, 0x15, 0xb0, 0x81, 0x45, 0xcc, 0x60, 0x09, 0x5b, 0xd8, 0xc6, 0x1c, + 0x96, 0xaf, 0x89, 0x2d, 0xc2, 0x62, 0x13, 0xd0, 0x58, 0x41, 0x3c, 0x16, 0xb1, 0x91, 0x0d, 0xc1, + 0x64, 0xab, 0x51, 0x59, 0xce, 0x5c, 0x96, 0xb2, 0x99, 0xbd, 0xc2, 0x66, 0x39, 0x5b, 0xd9, 0xcf, + 0x62, 0xb6, 0xb3, 0x1e, 0x10, 0xed, 0x68, 0x49, 0x6b, 0x5a, 0x03, 0xa1, 0x36, 0xb5, 0xa7, 0x0d, + 0x2d, 0x6b, 0x5b, 0x9b, 0xd8, 0xd7, 0xaa, 0xd6, 0xb5, 0xb2, 0x85, 0x6c, 0x64, 0x6b, 0xfb, 0x92, + 0xd8, 0xe2, 0x76, 0xb6, 0x81, 0xdd, 0x6d, 0x6e, 0xfb, 0xea, 0xdb, 0xdf, 0xe6, 0x35, 0xb8, 0xc2, + 0x6d, 0x2b, 0x71, 0x05, 0xfe, 0x14, 0xd7, 0xe3, 0x22, 0xd7, 0xb8, 0xca, 0x2d, 0xae, 0x56, 0x9b, + 0xeb, 0x80, 0xb2, 0x42, 0x37, 0xba, 0x61, 0x9d, 0x2e, 0x75, 0xad, 0x6a, 0xdd, 0xeb, 0x4a, 0x35, + 0xbb, 0xda, 0x35, 0x2a, 0x77, 0xfd, 0xa3, 0xd4, 0xef, 0x82, 0xd7, 0xbb, 0xe2, 0xed, 0x6e, 0x4d, + 0xcb, 0xbb, 0x81, 0x9d, 0xa2, 0x37, 0xbd, 0x38, 0x5d, 0x2f, 0x7b, 0x5f, 0xea, 0x5e, 0x51, 0xc0, + 0x37, 0xbe, 0xef, 0x35, 0x29, 0x7d, 0xe5, 0x6b, 0xdf, 0xfb, 0xe2, 0xb7, 0xa3, 0xfa, 0xd5, 0xcf, + 0x48, 0xfb, 0xeb, 0x5f, 0x8d, 0x02, 0x38, 0x25, 0x17, 0x1d, 0x30, 0x81, 0x29, 0x6a, 0xe0, 0x03, + 0x2f, 0x34, 0xc1, 0x8e, 0x5a, 0x30, 0x83, 0x1b, 0x2c, 0xd0, 0x07, 0xdb, 0xa7, 0xa0, 0x12, 0x9e, + 0x30, 0x3f, 0x2b, 0x2c, 0xca, 0x7c, 0x62, 0x38, 0xc3, 0xf6, 0xdc, 0x30, 0x87, 0xdb, 0xe9, 0x61, + 0xf9, 0x80, 0x38, 0xc4, 0x1f, 0x26, 0x27, 0x89, 0x45, 0x6c, 0xe2, 0x13, 0xa3, 0x78, 0x9b, 0x2a, + 0x1e, 0x09, 0x36, 0x5b, 0xec, 0xe2, 0x6a, 0xc2, 0x38, 0xc6, 0xcc, 0x9c, 0xb1, 0x7b, 0x9e, 0x69, + 0xe3, 0x1b, 0xd7, 0x38, 0xc7, 0x34, 0xee, 0x25, 0x8f, 0x47, 0x60, 0xcc, 0x1f, 0x93, 0x00, 0x98, + 0x42, 0x1e, 0xb2, 0x8f, 0x8b, 0x0c, 0xe4, 0x5b, 0x22, 0x59, 0x3d, 0xb1, 0x5c, 0xb2, 0x09, 0x5c, + 0xe9, 0xe4, 0x27, 0xaf, 0x32, 0xca, 0x52, 0x56, 0x14, 0x95, 0xcd, 0x73, 0xa8, 0x2b, 0x5b, 0xd2, + 0x4f, 0x5a, 0xde, 0xf2, 0x9e, 0xba, 0xec, 0x65, 0x39, 0x81, 0xd9, 0x93, 0x6f, 0x1a, 0xb3, 0x78, + 0xca, 0x6c, 0x66, 0x32, 0x9b, 0x29, 0xcd, 0x67, 0x5e, 0x33, 0x9b, 0xdb, 0xdc, 0xa5, 0x37, 0x5f, + 0x44, 0x4b, 0x72, 0x9e, 0xf3, 0x95, 0xea, 0x6c, 0x67, 0x27, 0xe1, 0x59, 0x0a, 0x51, 0xda, 0xb3, + 0xa7, 0x90, 0xe4, 0xfe, 0xe7, 0x3f, 0x17, 0x29, 0xd0, 0x82, 0xe6, 0x11, 0xa1, 0xb5, 0x63, 0xe8, + 0x43, 0x23, 0x7a, 0x46, 0x8a, 0x8e, 0x81, 0x8d, 0x1a, 0xed, 0x68, 0x46, 0x43, 0xda, 0x52, 0x2d, + 0x9a, 0xb4, 0x26, 0x1b, 0x65, 0xe9, 0x4b, 0x6f, 0x28, 0xd3, 0x11, 0xd9, 0x34, 0xa7, 0x75, 0x10, + 0xca, 0x4f, 0x83, 0xba, 0x42, 0xa2, 0x96, 0xce, 0x27, 0x4b, 0x3d, 0xea, 0x01, 0xa1, 0xda, 0x39, + 0x99, 0x5c, 0x75, 0x0f, 0x54, 0xed, 0xea, 0x57, 0x57, 0x32, 0xd6, 0x58, 0x7e, 0x24, 0xad, 0x29, + 0xcd, 0xca, 0x5b, 0xa7, 0xba, 0x90, 0xba, 0x36, 0x75, 0x2a, 0x7b, 0xdd, 0xe9, 0x57, 0x02, 0xfb, + 0x07, 0xc2, 0x1e, 0x36, 0xb1, 0xef, 0x68, 0x6c, 0x47, 0xe2, 0x32, 0xd9, 0xbe, 0x1e, 0x23, 0xb3, + 0x25, 0xf9, 0xc6, 0x67, 0x2b, 0xc7, 0xd9, 0xd2, 0x86, 0x76, 0x1a, 0xab, 0x2d, 0xaa, 0x23, 0x62, + 0x3b, 0xdb, 0x4d, 0xdc, 0xb6, 0x70, 0x8e, 0xe9, 0x6d, 0x56, 0x77, 0x3b, 0xdc, 0x4b, 0x18, 0x37, + 0xb9, 0xcb, 0xad, 0xcc, 0x73, 0xcb, 0x3a, 0x9b, 0xea, 0x0e, 0xf6, 0x37, 0xdb, 0x3d, 0xed, 0x18, + 0xc2, 0xfb, 0xdb, 0xdc, 0x9c, 0x77, 0xbc, 0x6b, 0x68, 0xef, 0x26, 0xd4, 0x3b, 0xdf, 0xf7, 0x76, + 0x27, 0xbf, 0x05, 0x59, 0xc0, 0x7f, 0xab, 0x8a, 0x2c, 0x02, 0xf7, 0x42, 0x3c, 0x0b, 0x6e, 0xf0, + 0xaf, 0x20, 0x3c, 0x1f, 0x5a, 0x59, 0x38, 0xc3, 0xb3, 0xe2, 0xf0, 0x87, 0x43, 0x25, 0xe2, 0xad, + 0x99, 0x38, 0xc5, 0x2b, 0x3e, 0xd0, 0x8b, 0xcb, 0xca, 0xa0, 0x1a, 0x47, 0x4d, 0x50, 0x3a, 0x6e, + 0x2b, 0x9e, 0x80, 0x7c, 0x34, 0x37, 0x19, 0x79, 0x1c, 0x1e, 0x6a, 0x72, 0x92, 0xc3, 0x24, 0xe5, + 0x27, 0x5f, 0x09, 0xcb, 0xed, 0x58, 0x92, 0x97, 0xcb, 0x31, 0x23, 0x32, 0xd7, 0x15, 0xcd, 0x6b, + 0x6e, 0x73, 0xac, 0x89, 0xe0, 0x7c, 0x0f, 0x3a, 0xdf, 0x39, 0xcf, 0x0f, 0xe2, 0x73, 0x61, 0xa9, + 0x34, 0xe8, 0x42, 0xd7, 0x07, 0xd1, 0xd5, 0x08, 0xd3, 0xa3, 0x9b, 0x71, 0xa6, 0x4a, 0x5f, 0x3a, + 0x3a, 0x9a, 0x5e, 0x08, 0x9b, 0x42, 0x3d, 0xea, 0xe3, 0x98, 0x3a, 0x23, 0x78, 0x6a, 0x75, 0x31, + 0x42, 0x23, 0xeb, 0xca, 0xda, 0x3a, 0xd7, 0xbb, 0x8e, 0x8c, 0xaf, 0x57, 0x22, 0xec, 0x62, 0x1f, + 0xfb, 0x2e, 0xca, 0x6e, 0xc5, 0xa9, 0xa2, 0xbd, 0x30, 0x14, 0x59, 0xbb, 0x17, 0x4d, 0xe2, 0x76, + 0x6d, 0xc1, 0x3d, 0xee, 0x72, 0x37, 0x2b, 0xdd, 0xeb, 0x1e, 0x89, 0xbb, 0x3b, 0x31, 0xef, 0x7a, + 0xdf, 0xbb, 0x5b, 0xfb, 0xbe, 0x97, 0xa8, 0x00, 0x3e, 0xf0, 0x6a, 0x1d, 0xbc, 0x12, 0xed, 0x6a, + 0x78, 0xbf, 0xb7, 0x21, 0xf1, 0xe6, 0x52, 0x0b, 0xe3, 0x1b, 0xef, 0xd7, 0xc7, 0x1b, 0x31, 0x2f, + 0x92, 0x87, 0xfc, 0x60, 0x2a, 0x2f, 0x44, 0x2a, 0x60, 0x5e, 0x5e, 0x86, 0xdd, 0xbc, 0xbd, 0x1c, + 0xeb, 0x79, 0x15, 0x4a, 0x26, 0xf4, 0xa2, 0xd7, 0x2c, 0xe9, 0x4b, 0x1f, 0x9a, 0xd3, 0x8b, 0xb0, + 0xb4, 0xaa, 0xdf, 0x86, 0x69, 0x5a, 0xef, 0x7a, 0xcf, 0xc2, 0xde, 0xf5, 0x09, 0x2e, 0x00, 0x00, 0x3b }; diff --git a/src/utils/gui/settings/GUIVisualizationSettings.h b/src/utils/gui/settings/GUIVisualizationSettings.h index 7848cd81dd59..00c265283b89 100644 --- a/src/utils/gui/settings/GUIVisualizationSettings.h +++ b/src/utils/gui/settings/GUIVisualizationSettings.h @@ -542,38 +542,38 @@ class GUIVisualizationSettings { enum class Detail : int { Level0 = 0, - CircleResolution32 = 0, // circle resolution = 32 - DrawPolygonTesselation = 0, // draw polygons tesselated - LaneDetails = 0, // offset, icons, indicators... - Text = 0, // draw text (E2, routes...) - VehiclePoly = 0, // draw vehicles as polygons - JunctionElementDetails = 0, // draw junction elements with high detail (crossings, connections..) - LockedIcons = 0, // draw lock icons + CircleResolution32 = 0, // circle resolution = 32 + DrawPolygonTesselation = 0, // draw polygons tesselated + LaneDetails = 0, // offset, icons, indicators... + Text = 0, // draw text (E2, routes...) + VehiclePoly = 0, // draw vehicles as polygons + JunctionElementDetails = 0, // draw junction elements with high detail (crossings, connections..) + LockedIcons = 0, // draw lock icons Level1 = 1, - CircleResolution16 = 1, // circle resolution = 16 - VehicleBox = 1, // vehicles as boxes - AdditionalDetails = 1, // stoppingPlace signs, EntryExit arrows... - GeometryPoint = 1, // draw geometry points - JunctionElement = 1, // crossings, walking area, connections and internal lanes - DottedContoursResampled = 1, // resample dotted contours - PreciseSelection = 1, // precise selection using boundaries + CircleResolution16 = 1, // circle resolution = 16 + VehicleBox = 1, // vehicles as boxes + AdditionalDetails = 1, // stoppingPlace signs, EntryExit arrows... + GeometryPoint = 1, // draw geometry points + JunctionElement = 1, // crossings, walking area, connections and internal lanes + DottedContoursResampled = 1, // resample dotted contours + PreciseSelection = 1, // precise selection using boundaries Level2 = 2, - CircleResolution8 = 2, // circle resolution = 8 - DrawPolygonSquare = 2, // draw polygons as squares - VehicleTriangle = 2, // draw vehicles as triangles - Names = 2, // draw element names - Additionals = 2, // draw additional elements - DottedContours = 2, // draw dotted contours - GeometryBoxLines = 2, // draw lines instead boxes in GUIGeometry::drawGeometry + CircleResolution8 = 2, // circle resolution = 8 + DrawPolygonSquare = 2, // draw polygons as squares + VehicleTriangle = 2, // draw vehicles as triangles + Names = 2, // draw element names + Additionals = 2, // draw additional elements + DottedContours = 2, // draw dotted contours + GeometryBoxLines = 2, // draw lines instead boxes in GUIGeometry::drawGeometry Level3 = 3, - CircleResolution4 = 3, // draw circle resolution as squares - TLSIcon = 3, // draw TLS icons + CircleResolution4 = 3, // draw circle resolution as squares + TLSIcon = 3, // draw TLS icons Level4 = 4, - GeometryBoxSimpleLine = 4, // draw lines with width = 1 instead boxes in GUIGeometry::drawGeometry + GeometryBoxSimpleLine = 4, // draw lines with width = 1 instead boxes in GUIGeometry::drawGeometry }; /// @brief constructor diff --git a/src/utils/vehicle/SUMOTrafficObject.h b/src/utils/vehicle/SUMOTrafficObject.h index 43ca41b8d31d..dc4b33e25a78 100644 --- a/src/utils/vehicle/SUMOTrafficObject.h +++ b/src/utils/vehicle/SUMOTrafficObject.h @@ -167,7 +167,7 @@ class SUMOTrafficObject : public Named { */ virtual double getMaxSpeed() const = 0; - virtual SUMOTime getWaitingTime(const bool accumulated=false) const = 0; + virtual SUMOTime getWaitingTime(const bool accumulated = false) const = 0; /** @brief Returns the object's current speed * @return The object's speed