router: post-rebase fixes

This commit is contained in:
Tomasz Wlostowski 2021-02-25 00:36:31 +01:00
parent 6948cdd8ef
commit c79610e132
1 changed files with 3 additions and 2 deletions

View File

@ -240,7 +240,8 @@ bool PRESERVE_VERTEX_CONSTRAINT::Check( int aVertex1, int aVertex2, const LINE*
for( int i = aVertex1; i < aVertex2; i++ ) for( int i = aVertex1; i < aVertex2; i++ )
{ {
int dist = aCurrentPath.CSegment(i).Distance( m_v ); SEG::ecoord dist = aCurrentPath.CSegment(i).SquaredDistance( m_v );
if ( dist <= 1 ) if ( dist <= 1 )
{ {
cv = true; cv = true;
@ -604,7 +605,7 @@ bool OPTIMIZER::Optimize( LINE* aLine, LINE* aResult )
if ( m_effortLevel & RESTRICT_AREA ) if ( m_effortLevel & RESTRICT_AREA )
{ {
auto c = new AREA_CONSTRAINT( m_world, m_restrictArea ); auto c = new AREA_CONSTRAINT( m_world, m_restrictArea, m_restrictAreaIsStrict );
AddConstraint( c ); AddConstraint( c );
} }